support retina display

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

diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 8d23a64bcbcc9a6085613b1f80ce673aacf2076c..168967fa14b1ac85fef76e84a0c3e117fa85240c 100644 (file)
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxRadioButton class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxRadioButton class
 // Author:      David Webster
 // Modified by:


@@ -14,33 +14,29 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
-
-class WXDLLEXPORT wxRadioButton: public wxControl
+class WXDLLIMPEXP_CORE wxRadioButton: public wxControl

 {
 public:
 {
 public:

-    inline wxRadioButton() {}
+    inline wxRadioButton() { Init(); }

     inline wxRadioButton( wxWindow*          pParent
                          ,wxWindowID         vId
                          ,const wxString&    rsLabel
                          ,const wxPoint&     rPos = wxDefaultPosition
                          ,const wxSize&      rSize = wxDefaultSize
                          ,long               lStyle = 0
     inline wxRadioButton( wxWindow*          pParent
                          ,wxWindowID         vId
                          ,const wxString&    rsLabel
                          ,const wxPoint&     rPos = wxDefaultPosition
                          ,const wxSize&      rSize = wxDefaultSize
                          ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                          ,const wxValidator& rValidator = wxDefaultValidator
                          ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                          ,const wxString&    rsName = wxRadioButtonNameStr
                          )
     {
                          ,const wxString&    rsName = wxRadioButtonNameStr
                          )
     {

+        Init();
+

         Create( pParent
                ,vId
                ,rsLabel
                ,rPos
                ,rSize
                ,lStyle
         Create( pParent
                ,vId
                ,rsLabel
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -51,20 +47,33 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rValidator = wxDefaultValidator
                 ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                 ,const wxString&    rsName = wxRadioButtonNameStr
                );
                 ,const wxString&    rsName = wxRadioButtonNameStr
                );

+

     virtual void SetLabel(const wxString& rsLabel);
     virtual void SetValue(bool bVal);
     virtual bool GetValue(void) const ;
 
     virtual void SetLabel(const wxString& rsLabel);
     virtual void SetValue(bool bVal);
     virtual bool GetValue(void) const ;
 

-    bool OS2Command( WXUINT wParam
-                    ,WXWORD wId
-                   );
-    void Command(wxCommandEvent& rEvent);
+    bool            OS2Command( WXUINT wParam
+                               ,WXWORD wId
+                              );
+    void            Command(wxCommandEvent& rEvent);
+    virtual MRESULT OS2WindowProc( WXUINT   uMsg
+                                  ,WXWPARAM wParam
+                                  ,WXLPARAM lParam
+                                 );
+    virtual void    SetFocus(void);
+
+protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    virtual wxSize DoGetBestSize() const;
+

 private:
 private:

+    void Init(void);
+
+    bool                            m_bFocusJustSet;
+

     DECLARE_DYNAMIC_CLASS(wxRadioButton)
 }; // end of wxRadioButton
 
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
 }; // end of wxRadioButton