projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A better fix for wxHash{Map,Set} with g++ 4.7.
[wxWidgets.git]
/
include
/
wx
/
msw
/
radiobox.h
diff --git
a/include/wx/msw/radiobox.h
b/include/wx/msw/radiobox.h
index 01db4da7d86535a845ba29ada48224b42541a4cb..5e3c362e51dfae3c619ca6bf037973637cd1cfe0 100644
(file)
--- a/
include/wx/msw/radiobox.h
+++ b/
include/wx/msw/radiobox.h
@@
-123,9
+123,14
@@
public:
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);
@@
-144,6
+149,9
@@
protected:
// get the total size occupied by the radio box buttons
wxSize GetTotalButtonSize(const wxSize& sizeBtn) const;
// 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 DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
@@
-158,6
+166,8
@@
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;