Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small cleanup, removed unused headers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-04 12:12:24 +00:00
parent e8cfff879e
commit ca8d899fcb
2 changed files with 73 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
include/wx/sizer.h
View File

@@ -14,19 +14,16 @@
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/button.h"
#include "wx/window.h" #include "wx/window.h"
#include "wx/frame.h"
#include "wx/dialog.h"
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// classes // classes
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
class WXDLLEXPORT wxButton;
class WXDLLEXPORT wxBoxSizer;
class WXDLLEXPORT wxSizerItem; class WXDLLEXPORT wxSizerItem;
class WXDLLEXPORT wxSizer; class WXDLLEXPORT wxSizer;
class WXDLLEXPORT wxBoxSizer;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxSizerFlags: flags used for an item in the sizer // wxSizerFlags: flags used for an item in the sizer
@@ -334,81 +331,81 @@ public:
// methods for adding elements to the sizer: there are Add/Insert/Prepend // methods for adding elements to the sizer: there are Add/Insert/Prepend
// overloads for each of window/sizer/spacer/wxSizerItem // overloads for each of window/sizer/spacer/wxSizerItem
inline wxSizerItem* Add( wxWindow *window, wxSizerItem* Add(wxWindow *window,
int proportion = 0, int proportion = 0,
int flag = 0, int flag = 0,
int border = 0, int border = 0,
wxObject* userData = NULL ); wxObject* userData = NULL);
inline wxSizerItem* Add( wxSizer *sizer, wxSizerItem* Add(wxSizer *sizer,
int proportion = 0, int proportion = 0,
int flag = 0, int flag = 0,
int border = 0, int border = 0,
wxObject* userData = NULL ); wxObject* userData = NULL);
inline wxSizerItem* Add( int width, wxSizerItem* Add(int width,
int height, int height,
int proportion = 0, int proportion = 0,
int flag = 0, int flag = 0,
int border = 0, int border = 0,
wxObject* userData = NULL ); wxObject* userData = NULL);
inline wxSizerItem* Add( wxWindow *window, const wxSizerFlags& flags ); wxSizerItem* Add( wxWindow *window, const wxSizerFlags& flags);
inline wxSizerItem* Add( wxSizer *sizer, const wxSizerFlags& flags ); wxSizerItem* Add( wxSizer *sizer, const wxSizerFlags& flags);
inline wxSizerItem* Add( wxSizerItem *item ); wxSizerItem* Add( wxSizerItem *item);
inline wxSizerItem* AddSpacer(int size); wxSizerItem* AddSpacer(int size);
inline wxSizerItem* AddStretchSpacer(int prop = 1); wxSizerItem* AddStretchSpacer(int prop = 1);
inline wxSizerItem* Insert( size_t index, wxSizerItem* Insert(size_t index,
wxWindow *window, wxWindow *window,
int proportion = 0, int proportion = 0,
int flag = 0, int flag = 0,
int border = 0, int border = 0,
wxObject* userData = NULL ); wxObject* userData = NULL);
inline wxSizerItem* Insert( size_t index, wxSizerItem* Insert(size_t index,
wxSizer *sizer, wxSizer *sizer,
int proportion = 0, int proportion = 0,
int flag = 0, int flag = 0,
int border = 0, int border = 0,
wxObject* userData = NULL ); wxObject* userData = NULL);
inline wxSizerItem* Insert( size_t index, wxSizerItem* Insert(size_t index,
int width, int width,
int height, int height,
int proportion = 0, int proportion = 0,
int flag = 0, int flag = 0,
int border = 0, int border = 0,
wxObject* userData = NULL ); wxObject* userData = NULL);
inline wxSizerItem* Insert( size_t index, wxSizerItem* Insert(size_t index,
wxWindow *window, wxWindow *window,
const wxSizerFlags& flags ); const wxSizerFlags& flags);
inline wxSizerItem* Insert( size_t index, wxSizerItem* Insert(size_t index,
wxSizer *sizer, wxSizer *sizer,
const wxSizerFlags& flags ); const wxSizerFlags& flags);
virtual wxSizerItem* Insert( size_t index, wxSizerItem *item ); virtual wxSizerItem* Insert( size_t index, wxSizerItem *item);
inline wxSizerItem* InsertSpacer(size_t index, int size); wxSizerItem* InsertSpacer(size_t index, int size);
inline wxSizerItem* InsertStretchSpacer(size_t index, int prop = 1); wxSizerItem* InsertStretchSpacer(size_t index, int prop = 1);
inline wxSizerItem* Prepend( wxWindow *window, wxSizerItem* Prepend(wxWindow *window,
int proportion = 0, int proportion = 0,
int flag = 0, int flag = 0,
int border = 0, int border = 0,
wxObject* userData = NULL ); wxObject* userData = NULL);
inline wxSizerItem* Prepend( wxSizer *sizer, wxSizerItem* Prepend(wxSizer *sizer,
int proportion = 0, int proportion = 0,
int flag = 0, int flag = 0,
int border = 0, int border = 0,
wxObject* userData = NULL ); wxObject* userData = NULL);
inline wxSizerItem* Prepend( int width, wxSizerItem* Prepend(int width,
int height, int height,
int proportion = 0, int proportion = 0,
int flag = 0, int flag = 0,
int border = 0, int border = 0,
wxObject* userData = NULL ); wxObject* userData = NULL);
inline wxSizerItem* Prepend( wxWindow *window, const wxSizerFlags& flags ); wxSizerItem* Prepend(wxWindow *window, const wxSizerFlags& flags);
inline wxSizerItem* Prepend( wxSizer *sizer, const wxSizerFlags& flags ); wxSizerItem* Prepend(wxSizer *sizer, const wxSizerFlags& flags);
inline wxSizerItem* Prepend( wxSizerItem *item ); wxSizerItem* Prepend(wxSizerItem *item);
inline wxSizerItem* PrependSpacer(int size); wxSizerItem* PrependSpacer(int size);
inline wxSizerItem* PrependStretchSpacer(int prop = 1); wxSizerItem* PrependStretchSpacer(int prop = 1);
// set (or possibly unset if window is NULL) or get the window this sizer // set (or possibly unset if window is NULL) or get the window this sizer
// is used in // is used in

1
src/common/sizer.cpp
View File

@@ -25,6 +25,7 @@
#include "wx/math.h" #include "wx/math.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/button.h"
#include "wx/statbox.h" #include "wx/statbox.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP