A better fix for wxHash{Map,Set} with g++ 4.7.

[wxWidgets.git] / include / wx / motif / checkbox.h

diff --git a/include/wx/motif/checkbox.h b/include/wx/motif/checkbox.h
index cbb6fd7d37c5bb55dada2f457e561418912801d7..8676ef2fdd433b048d72dde819e03d42ef7e6b3e 100644 (file)
--- a/include/wx/motif/checkbox.h
+++ b/include/wx/motif/checkbox.h
@@ -1,28 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        checkbox.h
+// Name:        wx/motif/checkbox.h
 // Purpose:     wxCheckBox class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKBOX_H_
 #define _WX_CHECKBOX_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "checkbox.h"
-#endif
-
-#include "wx/control.h"
-
 // Checkbox item (single checkbox)
-class WXDLLEXPORT wxCheckBox: public wxCheckBoxBase
+class WXDLLIMPEXP_CORE wxCheckBox: public wxCheckBoxBase
 {
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
-        
+
 public:
     inline wxCheckBox() { Init(); }
     inline wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
@@ -35,7 +29,7 @@ public:
 
         Create(parent, id, label, pos, size, style, validator, name);
     }
-    
+
     bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
@@ -44,7 +38,7 @@ public:
     virtual void SetValue(bool);
     virtual bool GetValue() const ;
     virtual void Command(wxCommandEvent& event);
-    
+
     // Implementation
     virtual void ChangeBackgroundColour();
 private:
@@ -54,6 +48,10 @@ private:
         m_evtType = wxEVT_COMMAND_CHECKBOX_CLICKED;
     }
 
+    virtual void DoSet3StateValue(wxCheckBoxState state);
+
+    virtual wxCheckBoxState DoGet3StateValue() const;
+
     // public for the callback
 public:
     // either exEVT_COMMAND_CHECKBOX_CLICKED or ..._TOGGLEBUTTON_CLICKED