Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h
index ea577bca889cb9d4f98b6e0156f95ccfdede10bd..4e9af38f7060fdb3de8b8847927010f9ac977114 100644 (file)
--- a/include/wx/msw/radiobut.h
+++ b/include/wx/msw/radiobut.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobut.h
+// Name:        wx/msw/radiobut.h

 // Purpose:     wxRadioButton class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Purpose:     wxRadioButton class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,11 +11,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,21 +47,23 @@ 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(wxRadioButton)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxRadioButton)

 };
 
 #endif
 };
 
 #endif