X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7a952d4cbdf13ee9bad234f3b08678988c6bba53..7d3f6b4ded6aa412cb1cc306fef478955d448c5b:/include/wx/motif/radiobox.h diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h index 1e4085f911..9b131fcb77 100644 --- a/include/wx/motif/radiobox.h +++ b/include/wx/motif/radiobox.h @@ -21,7 +21,7 @@ #include "wx/arrstr.h" -class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase +class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, public wxRadioBoxBase { public: wxRadioBox() { Init(); } @@ -30,7 +30,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, - int majorDim = 0, long style = wxRA_HORIZONTAL, + int majorDim = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr) { @@ -44,7 +44,7 @@ public: const wxPoint& pos, const wxSize& size, const wxArrayString& choices, - int majorDim = 0, long style = wxRA_HORIZONTAL, + int majorDim = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr) { @@ -54,13 +54,13 @@ public: majorDim, style, val, name); } - ~wxRadioBox(); + virtual ~wxRadioBox(); bool Create(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, - int majorDim = 0, long style = wxRA_HORIZONTAL, + int majorDim = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); @@ -68,7 +68,7 @@ public: const wxPoint& pos, const wxSize& size, const wxArrayString& choices, - int majorDim = 0, long style = wxRA_HORIZONTAL, + int majorDim = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); @@ -113,6 +113,7 @@ public: virtual WXWidget GetLabelWidget() const { return m_labelWidget; } protected: + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);