init member variables properly (patch 1156088)

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

diff --git a/include/wx/gtk1/tglbtn.h b/include/wx/gtk1/tglbtn.h
index 9d66c44797b54d9d7c58f5141b241883bb77627e..3c5bc6c5416d2b9133be84c5d1a883495f384590 100644 (file)
--- a/include/wx/gtk1/tglbtn.h
+++ b/include/wx/gtk1/tglbtn.h
@@ -7,7 +7,7 @@
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II

-// License:     Rocketeer license
+// License:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_TOGGLEBUTTON_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_TOGGLEBUTTON_H_


@@ -66,13 +66,15 @@ public:
     void SetLabel(const wxBitmap& label);
     bool Enable(bool enable = TRUE);
 
     void SetLabel(const wxBitmap& label);
     bool Enable(bool enable = TRUE);
 

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

     // implementation
     bool      m_blockEvent;
     wxBitmap  m_bitmap;
 
     void OnSetBitmap();
     // implementation
     bool      m_blockEvent;
     wxBitmap  m_bitmap;
 
     void OnSetBitmap();

-    void ApplyWidgetStyle();
+    void DoApplyWidgetStyle(GtkRcStyle *style);

     bool IsOwnGtkWindow(GdkWindow *window);
 
     virtual void OnInternalIdle();
     bool IsOwnGtkWindow(GdkWindow *window);
 
     virtual void OnInternalIdle();


@@ -81,6 +83,7 @@ public:
 private:
     DECLARE_DYNAMIC_CLASS(wxToggleBitmapButton)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxToggleBitmapButton)
 };

+

 //-----------------------------------------------------------------------------
 // wxToggleButton
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxToggleButton
 //-----------------------------------------------------------------------------


@@ -119,11 +122,13 @@ public:
     void SetLabel(const wxString& label);
     bool Enable(bool enable = TRUE);
 
     void SetLabel(const wxString& label);
     bool Enable(bool enable = TRUE);
 

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

  
     // implementation
     bool m_blockEvent;
 
  
     // implementation
     bool m_blockEvent;
 

-    void ApplyWidgetStyle();
+    void DoApplyWidgetStyle(GtkRcStyle *style);

     bool IsOwnGtkWindow(GdkWindow *window);
 
     virtual void OnInternalIdle();
     bool IsOwnGtkWindow(GdkWindow *window);
 
     virtual void OnInternalIdle();