X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a047aff270905b377a81657a90f92eb3297157d0..44a007122460fd4967021656a30dbf85161fc53f:/include/wx/msw/radiobox.h?ds=sidebyside diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h index c4e5b280a3..e6e1c1ae10 100644 --- a/include/wx/msw/radiobox.h +++ b/include/wx/msw/radiobox.h @@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxSubwindows; // wxRadioBox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRadioBox : public wxStaticBox, public wxRadioBoxBase +class WXDLLIMPEXP_CORE wxRadioBox : public wxStaticBox, public wxRadioBoxBase { public: wxRadioBox() { Init(); } @@ -32,7 +32,7 @@ public: const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, int majorDim = 0, - long style = wxRA_HORIZONTAL, + long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr) { @@ -49,7 +49,7 @@ public: const wxSize& size, const wxArrayString& choices, int majorDim = 0, - long style = wxRA_HORIZONTAL, + long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr) { @@ -68,7 +68,7 @@ public: const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, int majorDim = 0, - long style = wxRA_HORIZONTAL, + long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); bool Create(wxWindow *parent, @@ -78,7 +78,7 @@ public: const wxSize& size, const wxArrayString& choices, int majorDim = 0, - long style = wxRA_HORIZONTAL, + long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr); @@ -111,6 +111,8 @@ public: } #endif // wxUSE_HELP + virtual bool Reparent(wxWindowBase *newParent); + // we inherit a version always returning false from wxStaticBox, override // it to behave normally virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); } @@ -121,9 +123,14 @@ public: void SetLabelFont(const wxFont& WXUNUSED(font)) {} void SetButtonFont(const wxFont& font) { SetFont(font); } + // implementation only from now on // ------------------------------- + // This function can be used to check if the given radio button HWND + // belongs to one of our radio boxes. If it doesn't, NULL is returned. + static wxRadioBox *GetFromRadioButtonHWND(WXHWND hwnd); + virtual bool MSWCommand(WXUINT param, WXWORD id); void Command(wxCommandEvent& event); @@ -145,6 +152,7 @@ protected: virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); + virtual void DoMoveWindow(int x, int y, int width, int height); virtual wxSize DoGetBestSize() const; #if wxUSE_TOOLTIPS @@ -159,6 +167,10 @@ protected: // the buttons we contain wxSubwindows *m_radioButtons; + // and the special dummy button used only as a tab group boundary + WXHWND m_dummyHwnd; + wxWindowIDRef m_dummyId; + // array of widths and heights of the buttons, may be wxDefaultCoord if the // corresponding quantity should be computed int *m_radioWidth; @@ -169,7 +181,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxRadioBox) - DECLARE_NO_COPY_CLASS(wxRadioBox) + wxDECLARE_NO_COPY_CLASS(wxRadioBox); }; #endif