Implement for selection code.

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

diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h
index 06f317f52beaf1d44314aef236953b367f005195..4964591aa10a3dbd9d7d4866fe6a76b538ba05dc 100644 (file)
--- a/include/wx/gtk/tglbtn.h
+++ b/include/wx/gtk/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_


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

-class wxToggleButton;
-class wxToggleBitmapButton;
+class WXDLLIMPEXP_CORE wxToggleButton;
+class WXDLLIMPEXP_CORE wxToggleBitmapButton;

 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 

-extern const wxChar *wxCheckBoxNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxCheckBoxNameStr[];

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

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

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


@@ -63,7 +63,8 @@ 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);
 
     static wxVisualAttributes
     bool Enable(bool enable = TRUE);
 
     static wxVisualAttributes


@@ -74,11 +75,11 @@ public:
     wxBitmap  m_bitmap;
 
     void OnSetBitmap();
     wxBitmap  m_bitmap;
 
     void OnSetBitmap();

-    void DoApplyWidgetStyle(GtkRcStyle *style);
-    bool IsOwnGtkWindow(GdkWindow *window);

 
 

-    virtual void OnInternalIdle();
+protected:

     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetBestSize() const;

+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxToggleBitmapButton)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxToggleBitmapButton)


@@ -88,7 +89,7 @@ private:
 // wxToggleButton
 //-----------------------------------------------------------------------------
 
 // wxToggleButton
 //-----------------------------------------------------------------------------
 

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

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


@@ -128,11 +129,10 @@ public:
     // implementation
     bool m_blockEvent;
 
     // implementation
     bool m_blockEvent;
 

-    void DoApplyWidgetStyle(GtkRcStyle *style);
-    bool IsOwnGtkWindow(GdkWindow *window);
-
-    virtual void OnInternalIdle();
+protected:

     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetBestSize() const;

+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxToggleButton)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxToggleButton)