X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/msw/radiobox.h?ds=sidebyside diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h index a0809e76fc..53620db9b3 100644 --- a/include/wx/msw/radiobox.h +++ b/include/wx/msw/radiobox.h @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -32,7 +31,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 +48,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 +67,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 +77,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); @@ -97,6 +96,7 @@ public: // override some base class methods virtual bool Show(bool show = true); virtual bool Enable(bool enable = true); + virtual bool CanBeFocused() const; virtual void SetFocus(); virtual bool SetFont(const wxFont& font); virtual bool ContainsHWND(WXHWND hWnd) const; @@ -113,19 +113,20 @@ public: 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(); } - // returns true if the platform should explicitly apply a theme border virtual bool CanApplyThemeBorder() const { return false; } 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); @@ -144,9 +145,13 @@ protected: // get the total size occupied by the radio box buttons wxSize GetTotalButtonSize(const wxSize& sizeBtn) const; + // Adjust all the buttons to the new window size. + void PositionAllButtons(int x, int y, int width, int height); + 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 @@ -157,6 +162,8 @@ protected: virtual WXHRGN MSWGetRegionWithoutChildren(); #endif // __WXWINCE__ + // resolve ambiguity in base classes + virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); } // the buttons we contain wxSubwindows *m_radioButtons; @@ -175,7 +182,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxRadioBox) - DECLARE_NO_COPY_CLASS(wxRadioBox) + wxDECLARE_NO_COPY_CLASS(wxRadioBox); }; #endif