summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-10-06 17:14:10 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-10-08 13:03:13 +0100
commit6799ec80cd9ec6a5d0c3e11ec8a69084396f5420 (patch)
tree5ec5e7daba874c3859a61afc0ddc730570dcc919 /vcl/inc
parent9897942db6c53dff3a85b880d9d2b955011ef189 (diff)
import GtkScrollbar as scrollbars and connect GtkAdjustments
Change-Id: Idef8a338f09b52cf0758a6a35e3b5bbcc96a7383
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/vcl/builder.hxx12
1 files changed, 8 insertions, 4 deletions
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index 246f68dd208c..0a6574c8af03 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -19,6 +19,7 @@
class ListBox;
class NumericFormatter;
+class ScrollBar;
class VCL_DLLPUBLIC VclBuilder
{
@@ -90,10 +91,11 @@ private:
}
};
- typedef StringPair SpinButtonAdjustmentMap;
+ typedef StringPair WidgetAdjustmentMap;
Adjustment *get_adjustment_by_name(OString sID);
- static void mungeadjustment(NumericFormatter &rTarget, Adjustment &rAdjustment);
+ static void mungeSpinAdjustment(NumericFormatter &rTarget, Adjustment &rAdjustment);
+ static void mungeScrollAdjustment(ScrollBar &rTarget, Adjustment &rAdjustment);
typedef std::map<OString, OString> WidgetTranslations;
typedef std::map<OString, WidgetTranslations> Translations;
@@ -105,7 +107,8 @@ private:
std::vector<ComboBoxModelMap> m_aModelMaps;
std::vector<ModelAndId> m_aModels;
std::vector<AdjustmentAndId> m_aAdjustments;
- std::vector<SpinButtonAdjustmentMap> m_aAdjustmentMaps;
+ std::vector<WidgetAdjustmentMap> m_aSpinAdjustmentMaps;
+ std::vector<WidgetAdjustmentMap> m_aScrollAdjustmentMaps;
std::vector<ButtonImageWidgetMap> m_aButtonImageWidgetMaps;
StockMap m_aStockMap;
Translations m_aTranslations;
@@ -179,7 +182,8 @@ private:
Window *makeObject(Window *pParent, const OString &rClass, const OString &rID, stringmap &rVec);
bool extractGroup(const OString &id, stringmap &rVec);
bool extractModel(const OString &id, stringmap &rVec);
- bool extractAdjustment(const OString &id, stringmap &rVec);
+ bool extractSpinAdjustment(const OString &id, stringmap &rVec);
+ bool extractScrollAdjustment(const OString &id, stringmap &rVec);
bool extractImage(const OString &id, stringmap &rMap);
bool extractStock(const OString &id, stringmap &rMap);