diff options
| author | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-07-25 13:32:05 +0000 |
|---|---|---|
| committer | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-07-25 13:32:05 +0000 |
| commit | a90578a24ca14c42f30aa8220e234f3508e95ff6 (patch) | |
| tree | 66d6488a75676a3d55c19d9efd445e64100bc951 /src/live_effects/parameter/togglebutton.h | |
| parent | Add InkSelector class with some code improvements (diff) | |
| parent | Order some headers (diff) | |
| download | inkscape-a90578a24ca14c42f30aa8220e234f3508e95ff6.tar.gz inkscape-a90578a24ca14c42f30aa8220e234f3508e95ff6.zip | |
Merge changes from trunk
(bzr r14949.1.59)
Diffstat (limited to 'src/live_effects/parameter/togglebutton.h')
| -rw-r--r-- | src/live_effects/parameter/togglebutton.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/live_effects/parameter/togglebutton.h b/src/live_effects/parameter/togglebutton.h index 4e545bcfd..8390fec86 100644 --- a/src/live_effects/parameter/togglebutton.h +++ b/src/live_effects/parameter/togglebutton.h @@ -59,10 +59,10 @@ private: void refresh_button(); bool value; bool defvalue; - const Glib::ustring inactiveLabel; - const char * iconActive; - const char * iconInactive; - Inkscape::IconSize iconSize; + const Glib::ustring inactive_label; + const char * _icon_active; + const char * _icon_inactive; + Inkscape::IconSize _icon_size; Inkscape::UI::Widget::RegisteredToggleButton * checkwdg; sigc::signal<void> _signal_toggled; |