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 996f74487c1410de55bba8e68142de9e928b40ef..1d3557cd10319c109df7c10c8c4ac4d3255d7c0a 100644 (file)
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -14,100 +14,68 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
-

 class WXDLLEXPORT wxRadioButton: public wxControl
 {
 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,
+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
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
-           const wxValidator& validator = wxDefaultValidator,
-#  endif
+                         ,const wxValidator& rValidator = wxDefaultValidator

 #endif
 #endif

-           const wxString& name = wxRadioButtonNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
+                         ,const wxString&    rsName = wxRadioButtonNameStr
+                         )
+    {
+        Init();

 
 

-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
+        Create( pParent
+               ,vId
+               ,rsLabel
+               ,rPos
+               ,rSize
+               ,lStyle

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
-           const wxValidator& validator = wxDefaultValidator,
-#  endif
+               ,rValidator

 #endif
 #endif

-           const wxString& name = wxRadioButtonNameStr);
-
-  virtual void SetLabel(const wxString& label);
-  virtual void SetValue(bool val);
-  virtual bool GetValue() const ;
-
-  bool OS2Command(WXUINT param, WXWORD id);
-  void Command(wxCommandEvent& event);
-};
+               ,rsName
+              );
+    }

 
 

-// Not implemented
-class WXDLLEXPORT wxBitmap ;
-
-WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr;
-
-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,
+    bool Create( wxWindow* pParent
+                ,wxWindowID         vId
+                ,const wxString&    rsLabel
+                ,const wxPoint&     rPos = wxDefaultPosition
+                ,const wxSize&      rSize = wxDefaultSize
+                ,long               lStyle = 0

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
-           const wxValidator& validator = wxDefaultValidator,
-#  endif
+                ,const wxValidator& rValidator = wxDefaultValidator

 #endif
 #endif

-           const wxString& name = wxBitmapRadioButtonNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
+                ,const wxString&    rsName = wxRadioButtonNameStr
+               );

 
 

-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxBitmap *label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-#if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
-           const wxValidator& validator = wxDefaultValidator,
-#  endif
-#endif
-           const wxString& name = wxBitmapRadioButtonNameStr);
+    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 void SetFocus(void);
+protected:
+    virtual wxSize DoGetBestSize() const;

 
 

-  virtual void SetLabel(const wxBitmap *label);
-  virtual void SetValue(bool val) ;
-  virtual bool GetValue() const ;

 private:
 private:

-  // virtual function hiding suppression, do not use
-  virtual void SetLabel(const wxString& label)
-  { wxRadioButton::SetLabel(label); };
-};
+    void Init(void);
+
+    bool                            m_bFocusJustSet;
+
+    DECLARE_DYNAMIC_CLASS(wxRadioButton)
+}; // end of wxRadioButton

 
 #endif
     // _WX_RADIOBUT_H_
 
 #endif
     // _WX_RADIOBUT_H_