Don't rely on __GXX_RTTI being defined with g++ < 4.3.

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

diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h
index 9d66c44797b54d9d7c58f5141b241883bb77627e..aa75f3898c65f7677205784d4ed698065450d0df 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,25 +19,25 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxToggleButton;
-class wxToggleBitmapButton;
+class WXDLLIMPEXP_FWD_CORE wxToggleButton;
+class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton;

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

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

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxToggleBitmapButton
+// wxBitmapToggleButton

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

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

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

-    wxToggleBitmapButton() {}
-    wxToggleBitmapButton(wxWindow *parent,
+    wxBitmapToggleButton() {}
+    wxBitmapToggleButton(wxWindow *parent,

                    wxWindowID id,
                    const wxBitmap& label,
                    const wxPoint& pos = wxDefaultPosition,
                    wxWindowID id,
                    const wxBitmap& label,
                    const wxPoint& pos = wxDefaultPosition,


@@ -63,29 +63,37 @@ public:
     bool GetValue() const;
 
     // Set the label
     bool GetValue() const;
 
     // Set the label

-    void SetLabel(const wxBitmap& label);
-    bool Enable(bool enable = TRUE);
+    virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); }
+    virtual void SetLabel(const wxBitmap& label);
+    bool Enable(bool enable = true);
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 
 

- 

     // implementation
     // implementation

-    bool      m_blockEvent;

     wxBitmap  m_bitmap;
 
     void OnSetBitmap();
     wxBitmap  m_bitmap;
 
     void OnSetBitmap();

-    void ApplyWidgetStyle();
-    bool IsOwnGtkWindow(GdkWindow *window);

 
 

-    virtual void OnInternalIdle();
+protected:
+    void GTKDisableEvents();
+    void GTKEnableEvents();
+

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

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

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxToggleBitmapButton)
+    typedef wxToggleButtonBase base_type;
+
+    DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton)

 };
 };

+

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

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

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


@@ -117,19 +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);

 
 

- 
-    // implementation
-    bool m_blockEvent;
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 
 

-    void ApplyWidgetStyle();
-    bool IsOwnGtkWindow(GdkWindow *window);
+protected:
+    void GTKDisableEvents();
+    void GTKEnableEvents();

 
 

-    virtual void OnInternalIdle();

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

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

 
 private:
 
 private:

+    typedef wxToggleButtonBase base_type;
+

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