Some warnings removed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -230,11 +230,21 @@ class WXDLLEXPORT wxSizer: public wxWindow
|
||||
~wxSizer();
|
||||
|
||||
bool Create(wxWindow *parent, wxSizerBehaviour behav = wxSizerNone);
|
||||
|
||||
virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
|
||||
virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
|
||||
{ wxWindow::SetSize(rect, sizeFlags); }
|
||||
virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
|
||||
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
|
||||
|
||||
virtual void GetSize(int *w, int *h) const;
|
||||
wxSize GetSize() const { return wxWindow::GetSize(); }
|
||||
|
||||
virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); }
|
||||
wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
|
||||
|
||||
virtual void GetPosition(int *x, int *y) const;
|
||||
wxPoint GetPosition() const { return wxWindow::GetPosition(); }
|
||||
|
||||
inline void SizerSetSize(int x, int y, int w, int h)
|
||||
{ SetSize(x, y, w, h); }
|
||||
|
@@ -85,7 +85,8 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
|
||||
virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
|
||||
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
|
||||
|
||||
virtual void SetLabel(const wxBitmap *bitmap);
|
||||
virtual void SetLabel(const wxBitmap& bitmap);
|
||||
virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); };
|
||||
};
|
||||
#endif
|
||||
// _WX_CHECKBOX_H_
|
||||
|
@@ -175,6 +175,7 @@ public:
|
||||
|
||||
// MDI operations
|
||||
virtual void Maximize();
|
||||
virtual void Maximize(bool WXUNUSED(maximize)) { };
|
||||
inline void Minimize() { Iconize(TRUE); };
|
||||
virtual void Iconize(bool iconize);
|
||||
virtual void Restore();
|
||||
|
@@ -86,7 +86,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
|
||||
{ wxWindow::SetSize(rect, sizeFlags); }
|
||||
void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
|
||||
|
||||
virtual void SetLabel(const wxBitmap *bitmap);
|
||||
virtual void SetLabel(const wxBitmap& bitmap);
|
||||
};
|
||||
#endif
|
||||
// _WX_CHECKBOX_H_
|
||||
|
@@ -276,11 +276,15 @@
|
||||
|
||||
#endif
|
||||
|
||||
// Things that don't work for 16-bit compilation
|
||||
#if defined(__WXMSW__) && !defined(__WIN32__)
|
||||
|
||||
#undef wxUSE_THREADS
|
||||
#define wxUSE_THREADS 0
|
||||
|
||||
#undef wxUSE_TOOLTIPS
|
||||
#define wxUSE_TOOLTIPS 0
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@@ -75,7 +75,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
|
||||
virtual void SetValue(bool);
|
||||
virtual bool GetValue() const ;
|
||||
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
|
||||
virtual void SetLabel(const wxBitmap *bitmap);
|
||||
virtual void SetLabel(const wxBitmap& bitmap);
|
||||
};
|
||||
#endif
|
||||
// _WX_CHECKBOX_H_
|
||||
|
Reference in New Issue
Block a user