provide backward-compat wxCursor(int) ctor; remove empty stubs of XBM ctor from all...

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

diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h
index 723a99ba729c9b2b9b5c0a442ecf4a1f5cbd7db0..41d6ef1d3b0744be1fc82c868c85b6db603a27d2 100644 (file)
--- a/include/wx/msw/radiobut.h
+++ b/include/wx/msw/radiobut.h
@@ -12,11 +12,7 @@
 #ifndef _WX_RADIOBUT_H_
 #define _WX_RADIOBUT_H_
 
 #ifndef _WX_RADIOBUT_H_
 #define _WX_RADIOBUT_H_
 

-#ifdef __GNUG__
-    #pragma interface "radiobut.h"
-#endif
-
-class WXDLLEXPORT wxRadioButton: public wxControl
+class WXDLLIMPEXP_CORE wxRadioButton: public wxControl

 {
 public:
     // ctors and creation functions
 {
 public:
     // ctors and creation functions


@@ -52,19 +48,21 @@ 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 bool HasTransparentBackground() { return true; }

 
 

-    virtual void SetFocus();
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

 
 protected:
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }

     virtual wxSize DoGetBestSize() const;
 
 private:
     // common part of all ctors
     void Init();
 
     virtual wxSize DoGetBestSize() const;
 
 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_NO_COPY(wxRadioButton)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxRadioButton)
 };