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 ee96b5008b6ca0fe1ef0c432fdcacc3220befc32..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,42 +14,68 @@
 
 #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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxRadioButton)
- protected:
- public:
-  inline wxRadioButton() {}
-  inline wxRadioButton(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-#if wxUSE_VALIDATORS
-           const wxValidator& validator = wxDefaultValidator,
-#endif
-           const wxString& name = wxRadioButtonNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-#if wxUSE_VALIDATORS
-           const wxValidator& validator = wxDefaultValidator,
-#endif
-           const wxString& name = wxRadioButtonNameStr);
+public:
+    inline wxRadioButton() { Init(); }
+    inline wxRadioButton( wxWindow*          pParent
+                         ,wxWindowID         vId
+                         ,const wxString&    rsLabel
+                         ,const wxPoint&     rPos = wxDefaultPosition
+                         ,const wxSize&      rSize = wxDefaultSize
+                         ,long               lStyle = 0
+                         ,const wxValidator& rValidator = wxDefaultValidator
+                         ,const wxString&    rsName = wxRadioButtonNameStr
+                         )
+    {
+        Init();
+
+        Create( pParent
+               ,vId
+               ,rsLabel
+               ,rPos
+               ,rSize
+               ,lStyle
+               ,rValidator
+               ,rsName
+              );
+    }
+
+    bool Create( wxWindow* pParent
+                ,wxWindowID         vId
+                ,const wxString&    rsLabel
+                ,const wxPoint&     rPos = wxDefaultPosition
+                ,const wxSize&      rSize = wxDefaultSize
+                ,long               lStyle = 0
+                ,const wxValidator& rValidator = wxDefaultValidator
+                ,const wxString&    rsName = wxRadioButtonNameStr
+               );
+
+    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);
+    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:
+    void Init(void);

 
 

-  virtual void SetLabel(const wxString& label);
-  virtual void SetValue(bool val);
-  virtual bool GetValue() const ;
+    bool                            m_bFocusJustSet;

 
 

-  bool OS2Command(WXUINT param, WXWORD id);
-  void Command(wxCommandEvent& event);
-};
+    DECLARE_DYNAMIC_CLASS(wxRadioButton)
+}; // end of wxRadioButton

 
 #endif
     // _WX_RADIOBUT_H_
 
 #endif
     // _WX_RADIOBUT_H_