Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk1/tglbtn.h b/include/wx/gtk1/tglbtn.h
index 9d66c44797b54d9d7c58f5141b241883bb77627e..708cdd3292794aa70ca0746519237c12b2e9b7f4 100644 (file)
--- a/include/wx/gtk1/tglbtn.h
+++ b/include/wx/gtk1/tglbtn.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/tglbtn.h
+// Name:        wx/gtk1/tglbtn.h

 // Purpose:     Declaration of the wxToggleButton class, which implements a
 //              toggle button under wxGTK.
 // Author:      John Norris, minor changes by Axel Schlueter
 // Purpose:     Declaration of the wxToggleButton class, which implements a
 //              toggle button under wxGTK.
 // Author:      John Norris, minor changes by Axel Schlueter


@@ -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
+// Licence:     wxWindows licence

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


@@ -19,20 +19,14 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxToggleButton;
-class wxToggleBitmapButton;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const wxChar *wxCheckBoxNameStr;
+class WXDLLIMPEXP_FWD_CORE wxToggleButton;
+class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton;

 
 //-----------------------------------------------------------------------------
 // wxToggleBitmapButton
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxToggleBitmapButton
 //-----------------------------------------------------------------------------
 

-class wxToggleBitmapButton: public wxControl
+class WXDLLIMPEXP_CORE wxToggleBitmapButton: public wxToggleButtonBase

 {
 public:
     // construction/destruction
 {
 public:
     // construction/destruction


@@ -63,16 +57,19 @@ public:
     bool GetValue() const;
 
     // Set the label
     bool GetValue() const;
 
     // Set the label

-    void SetLabel(const wxBitmap& 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
     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,11 +78,12 @@ public:
 private:
     DECLARE_DYNAMIC_CLASS(wxToggleBitmapButton)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxToggleBitmapButton)
 };

+

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

-class wxToggleButton: public wxControl
+class WXDLLIMPEXP_CORE wxToggleButton: public wxControl

 {
 public:
     // construction/destruction
 {
 public:
     // construction/destruction


@@ -119,11 +117,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();