various minor fixes to wxHashMap: compilation warnings suppressed, use calloc() inste...

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

diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 4d4e48a5798da0383912906d82d12e85f197bb92..1d3557cd10319c109df7c10c8c4ac4d3255d7c0a 100644 (file)
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -14,76 +14,68 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
-
 class WXDLLEXPORT 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,
-           const wxValidator& validator = wxDefaultValidator,
-           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,
-           const wxValidator& validator = wxDefaultValidator,
-           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
+#if wxUSE_VALIDATORS
+                         ,const wxValidator& rValidator = wxDefaultValidator
+#endif
+                         ,const wxString&    rsName = wxRadioButtonNameStr
+                         )
+    {
+        Init();
 
-  virtual void SetLabel(const wxString& label);
-  virtual void SetValue(bool val);
-  virtual bool GetValue() const ;
+        Create( pParent
+               ,vId
+               ,rsLabel
+               ,rPos
+               ,rSize
+               ,lStyle
+#if wxUSE_VALIDATORS
+               ,rValidator
+#endif
+               ,rsName
+              );
+    }
 
-  bool OS2Command(WXUINT param, WXWORD id);
-  void Command(wxCommandEvent& event);
-};
+    bool Create( 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
+#endif
+                ,const wxString&    rsName = wxRadioButtonNameStr
+               );
 
-// Not implemented
-class WXDLLEXPORT wxBitmap ;
+    virtual void SetLabel(const wxString& rsLabel);
+    virtual void SetValue(bool bVal);
+    virtual bool GetValue(void) const ;
 
-WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr;
+    bool         OS2Command( WXUINT wParam
+                            ,WXWORD wId
+                           );
+    void         Command(wxCommandEvent& rEvent);
+    virtual void SetFocus(void);
+protected:
+    virtual wxSize DoGetBestSize() const;
 
-class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
-{
-  DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton)
- protected:
-  wxBitmap *theButtonBitmap;
- public:
-  inline wxBitmapRadioButton() { theButtonBitmap = NULL; }
-  inline wxBitmapRadioButton(wxWindow *parent, wxWindowID id,
-           const wxBitmap *label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxBitmapRadioButtonNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
+private:
+    void Init(void);
 
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxBitmap *label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxBitmapRadioButtonNameStr);
+    bool                            m_bFocusJustSet;
 
-  virtual void SetLabel(const wxBitmap *label);
-  virtual void SetValue(bool val) ;
-  virtual bool GetValue() const ;
-private:
-  // virtual function hiding suppression, do not use
-  virtual void SetLabel(const wxString& label)
-  { wxRadioButton::SetLabel(label); };
-};
+    DECLARE_DYNAMIC_CLASS(wxRadioButton)
+}; // end of wxRadioButton
 
 #endif
     // _WX_RADIOBUT_H_