Instead of just deleting m_popupInterface, call Destroy() of its wxWindow-based popup...

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

diff --git a/include/wx/gtk/tglbtn.h b/include/wx/gtk/tglbtn.h
index 1b7d9d3ed487def1642aa48487f0916367ff2203..0886c2dcc42cce187117808dbe3bc267166ad7ed 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
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_TOGGLEBUTTON_H_
@@ -22,12 +22,6 @@
 class WXDLLIMPEXP_FWD_CORE wxToggleButton;
 class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton;
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
-
 //-----------------------------------------------------------------------------
 // wxBitmapToggleButton
 //-----------------------------------------------------------------------------
@@ -65,7 +59,7 @@ public:
     // 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);
@@ -84,6 +78,8 @@ protected:
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
 private:
+    typedef wxToggleButtonBase base_type;
+
     DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton)
 };
 
@@ -123,7 +119,7 @@ public:
 
     // 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);
@@ -137,6 +133,8 @@ protected:
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
 private:
+    typedef wxToggleButtonBase base_type;
+
     DECLARE_DYNAMIC_CLASS(wxToggleButton)
 };