use MSWAlwaysDrawBg() to fix the problem with black background; rewrote/cleaned up...

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

diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h
index 4294d847c26cd3146ddcdced332b2ad9b91d5d69..da92a8e18fdd2f1ae4ed73989320950e918994c0 100644 (file)
--- a/include/wx/msw/radiobut.h
+++ b/include/wx/msw/radiobut.h
@@ -52,9 +52,9 @@ public:
     // implementation only from now on
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual void Command(wxCommandEvent& event);
     // 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 ApplyParentThemeBackground(const wxColour& bg)
+        { SetBackgroundColour(bg); }

 
 

-    virtual void SetFocus();

 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;


@@ -63,8 +63,9 @@ private:
     // common part of all ctors
     void Init();
 
     // 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_NO_COPY(wxRadioButton)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxRadioButton)
 };