Patch #826420, and also adapted to new SWIG

[wxWidgets.git] / include / wx / msw / radiobut.h

diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h
index ea577bca889cb9d4f98b6e0156f95ccfdede10bd..b47ee2e241ed5fb7aae8d01c16cba9174e8ed0b4 100644 (file)
--- a/include/wx/msw/radiobut.h
+++ b/include/wx/msw/radiobut.h
@@ -12,7 +12,7 @@
 #ifndef _WX_RADIOBUT_H_
 #define _WX_RADIOBUT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "radiobut.h"
 #endif
 
@@ -52,9 +52,6 @@ public:
     // implementation only from now on
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual void Command(wxCommandEvent& event);
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
-    virtual void SetFocus();
 
 protected:
     virtual wxSize DoGetBestSize() const;
@@ -63,10 +60,11 @@ private:
     // common part of all ctors
     void Init();
 
-    // see the comments in SetFocus()
-    bool m_focusJustSet;
+    // we need to store the state internally as the result of GetValue()
+    // sometimes gets out of sync in WM_COMMAND handler
+    bool m_isChecked;
 
-    DECLARE_DYNAMIC_CLASS(wxRadioButton)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxRadioButton)
 };
 
 #endif