X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7a952d4cbdf13ee9bad234f3b08678988c6bba53..b5ec0c78b521cfa0f276e4d5d830f35b4fa26e91:/include/wx/os2/radiobox.h?ds=inline diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h index bc6257dfff..fda1b8ba18 100644 --- a/include/wx/os2/radiobox.h +++ b/include/wx/os2/radiobox.h @@ -13,9 +13,9 @@ #define _WX_RADIOBOX_H_ // List box item -class WXDLLEXPORT wxBitmap ; +class WXDLLIMPEXP_FWD_CORE wxBitmap ; -class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase +class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase { public: wxRadioBox(); @@ -28,7 +28,7 @@ public: ,int nNum = 0 ,const wxString asChoices[] = NULL ,int nMajorDim = 0 - ,long lStyle = wxRA_HORIZONTAL + ,long lStyle = wxRA_SPECIFY_COLS ,const wxValidator& rVal = wxDefaultValidator ,const wxString& rsName = wxRadioBoxNameStr ) @@ -54,7 +54,7 @@ public: ,const wxSize& rSize ,const wxArrayString& asChoices ,int nMajorDim = 0 - ,long lStyle = wxRA_HORIZONTAL + ,long lStyle = wxRA_SPECIFY_COLS ,const wxValidator& rVal = wxDefaultValidator ,const wxString& rsName = wxRadioBoxNameStr ) @@ -72,7 +72,7 @@ public: ); } - ~wxRadioBox(); + virtual ~wxRadioBox(); bool Create( wxWindow* pParent ,wxWindowID vId @@ -82,7 +82,7 @@ public: ,int nNum = 0 ,const wxString asChoices[] = NULL ,int nMajorDim = 0 - ,long lStyle = wxRA_HORIZONTAL + ,long lStyle = wxRA_SPECIFY_COLS ,const wxValidator& rVal = wxDefaultValidator ,const wxString& rsName = wxRadioBoxNameStr ); @@ -94,7 +94,7 @@ public: ,const wxSize& rSize ,const wxArrayString& asChoices ,int nMajorDim = 0 - ,long lStyle = wxRA_HORIZONTAL + ,long lStyle = wxRA_SPECIFY_COLS ,const wxValidator& rVal = wxDefaultValidator ,const wxString& rsName = wxRadioBoxNameStr ); @@ -150,7 +150,7 @@ public: inline void SetButtonFont(const wxFont& rFont) { SetFont(rFont); } void SetFocus(void); virtual bool SetFont(const wxFont& rFont); - inline void SetLabelFont(const wxFont& WXUNUSED(font)) {}; + inline void SetLabelFont(const wxFont& WXUNUSED(font)) {} virtual void SetSelection(int nIndex); virtual void SetString(unsigned int nNum, const wxString& rsLabel); virtual bool SetStringSelection(const wxString& rsStr); @@ -165,6 +165,7 @@ public: wxString GetLabel(int nItem) const; protected: + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual wxSize DoGetBestSize(void) const; virtual void DoSetSize( int nX ,int nY