Remove unnecessary Mac-specific TOOLKIT_LOWERCASE setting.

[wxWidgets.git] / include / wx / gtk / tglbtn.h

diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h
index 1a656e6c09c55c87893d21493522f89a7a641f1c..aa75f3898c65f7677205784d4ed698065450d0df 100644 (file)
--- a/include/wx/gtk/tglbtn.h
+++ b/include/wx/gtk/tglbtn.h
@@ -26,7 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern WXDLLIMPEXP_CORE const char wxCheckBoxNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];

 
 //-----------------------------------------------------------------------------
 // wxBitmapToggleButton
 
 //-----------------------------------------------------------------------------
 // wxBitmapToggleButton


@@ -65,23 +65,27 @@ public:
     // Set the label
     virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); }
     virtual void SetLabel(const wxBitmap& label);
     // Set the label
     virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); }
     virtual void SetLabel(const wxBitmap& label);

-    bool Enable(bool enable = TRUE);
+    bool Enable(bool enable = true);

 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     // implementation
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     // implementation

-    bool      m_blockEvent;

     wxBitmap  m_bitmap;
 
     void OnSetBitmap();
 
 protected:
     wxBitmap  m_bitmap;
 
     void OnSetBitmap();
 
 protected:

+    void GTKDisableEvents();
+    void GTKEnableEvents();
+

     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
 private:
     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
 private:

+    typedef wxToggleButtonBase base_type;
+

     DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton)
 };
 


@@ -121,20 +125,22 @@ public:
 
     // Set the label
     void SetLabel(const wxString& label);
 
     // Set the label
     void SetLabel(const wxString& label);

-    bool Enable(bool enable = TRUE);
+    bool Enable(bool enable = true);

 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

- 
-    // implementation
-    bool m_blockEvent;

 
 protected:
 
 protected:

+    void GTKDisableEvents();
+    void GTKEnableEvents();
+

     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
 private:
     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
 private:

+    typedef wxToggleButtonBase base_type;
+

     DECLARE_DYNAMIC_CLASS(wxToggleButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxToggleButton)
 };