projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove wxSplitterWindow::m_checkRequestedSashPosition.
[wxWidgets.git]
/
include
/
wx
/
msw
/
radiobox.h
diff --git
a/include/wx/msw/radiobox.h
b/include/wx/msw/radiobox.h
index 05bccdc050c0355551975f163311ed3d15f986b6..2edf86df4f2ba161ba70e5848309baeee6c8a5a2 100644
(file)
--- a/
include/wx/msw/radiobox.h
+++ b/
include/wx/msw/radiobox.h
@@
-14,13
+14,13
@@
#include "wx/statbox.h"
#include "wx/statbox.h"
-class WXDLL
EXPORT
wxSubwindows;
+class WXDLL
IMPEXP_FWD_CORE
wxSubwindows;
// ----------------------------------------------------------------------------
// wxRadioBox
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxRadioBox
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxRadioBox : public wxStaticBox, public wxRadioBoxBase
+class WXDLL
IMPEXP_CORE
wxRadioBox : public wxStaticBox, public wxRadioBoxBase
{
public:
wxRadioBox() { Init(); }
{
public:
wxRadioBox() { Init(); }
@@
-32,7
+32,7
@@
public:
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
int majorDim = 0,
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)
{
const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr)
{
@@
-49,7
+49,7
@@
public:
const wxSize& size,
const wxArrayString& choices,
int majorDim = 0,
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)
{
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,
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,
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,
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);
const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr);
@@
-111,16
+111,26
@@
public:
}
#endif // wxUSE_HELP
}
#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(); }
// 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); }
void SetLabelFont(const wxFont& WXUNUSED(font)) {}
void SetButtonFont(const wxFont& font) { SetFont(font); }
+
// implementation only from now on
// -------------------------------
// 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);
virtual bool MSWCommand(WXUINT param, WXWORD id);
void Command(wxCommandEvent& event);
@@
-142,6
+152,7
@@
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
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
virtual wxSize DoGetBestSize() const;
#if wxUSE_TOOLTIPS
@@
-152,10
+163,16
@@
protected:
virtual WXHRGN MSWGetRegionWithoutChildren();
#endif // __WXWINCE__
virtual WXHRGN MSWGetRegionWithoutChildren();
#endif // __WXWINCE__
+ // resolve ambiguity in base classes
+ virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); }
// the buttons we contain
wxSubwindows *m_radioButtons;
// 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;
// array of widths and heights of the buttons, may be wxDefaultCoord if the
// corresponding quantity should be computed
int *m_radioWidth;
@@
-166,7
+183,7
@@
protected:
private:
DECLARE_DYNAMIC_CLASS(wxRadioBox)
private:
DECLARE_DYNAMIC_CLASS(wxRadioBox)
- DECLARE_NO_COPY_CLASS(wxRadioBox)
+ wxDECLARE_NO_COPY_CLASS(wxRadioBox);
};
#endif
};
#endif