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

moved wxWindow::GetBestSize implementation into DoGetBestSize

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-09-30 16:37:58 +00:00
parent 024f89f972
commit 571f6981e2
8 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/mdig.h
View File

@@ -158,7 +158,7 @@ public:
#endif #endif
// no size hints // no size hints
virtual void SetSizeHints( int WXUNUSED(minW), virtual void DoSetSizeHints( int WXUNUSED(minW),
int WXUNUSED(minH), int WXUNUSED(minH),
int WXUNUSED(maxW) = wxDefaultCoord, int WXUNUSED(maxW) = wxDefaultCoord,
int WXUNUSED(maxH) = wxDefaultCoord, int WXUNUSED(maxH) = wxDefaultCoord,

2
include/wx/gtk/mdi.h
View File

@@ -144,7 +144,7 @@ public:
#endif #endif
// no size hints // no size hints
virtual void SetSizeHints( int WXUNUSED(minW), virtual void DoSetSizeHints( int WXUNUSED(minW),
int WXUNUSED(minH), int WXUNUSED(minH),
int WXUNUSED(maxW) = -1, int WXUNUSED(maxW) = -1,
int WXUNUSED(maxH) = -1, int WXUNUSED(maxH) = -1,

2
include/wx/gtk1/mdi.h
View File

@@ -144,7 +144,7 @@ public:
#endif #endif
// no size hints // no size hints
virtual void SetSizeHints( int WXUNUSED(minW), virtual void DoSetSizeHints( int WXUNUSED(minW),
int WXUNUSED(minH), int WXUNUSED(minH),
int WXUNUSED(maxW) = -1, int WXUNUSED(maxW) = -1,
int WXUNUSED(maxH) = -1, int WXUNUSED(maxH) = -1,

2
include/wx/mac/carbon/slider.h
View File

@@ -80,7 +80,7 @@ public:
// set min/max size of the slider // set min/max size of the slider
virtual void SetSizeHints( int minW, int minH, virtual void DoSetSizeHints( int minW, int minH,
int maxW = -1, int maxH = -1, int maxW = -1, int maxH = -1,
int incW = -1, int incH = -1 ); int incW = -1, int incH = -1 );

2
include/wx/mac/classic/slider.h
View File

@@ -80,7 +80,7 @@ public:
// set min/max size of the slider // set min/max size of the slider
virtual void SetSizeHints( int minW, int minH, virtual void DoSetSizeHints( int minW, int minH,
int maxW = -1, int maxH = -1, int maxW = -1, int maxH = -1,
int incW = -1, int incH = -1 ); int incW = -1, int incH = -1 );

2
include/wx/motif/mdi.h
View File

@@ -156,7 +156,7 @@ public:
void ReleaseMouse(); void ReleaseMouse();
void Raise(); void Raise();
void Lower(void); void Lower(void);
void SetSizeHints(int minW = -1, int minH = -1, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1); void DoSetSizeHints(int minW = -1, int minH = -1, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1);
// MDI operations // MDI operations
virtual void Maximize(); virtual void Maximize();

16
include/wx/window.h
View File

@@ -364,15 +364,23 @@ public:
// set min/max size of the window // set min/max size of the window
virtual void SetSizeHints( int minW, int minH, virtual void SetSizeHints( int minW, int minH,
int maxW = wxDefaultCoord, int maxH = wxDefaultCoord, int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
int incW = wxDefaultCoord, int incH = wxDefaultCoord ); int incW = wxDefaultCoord, int incH = wxDefaultCoord )
{
DoSetSizeHints(minW, minH, maxW, maxH, incW, incH);
}
void SetSizeHints( const wxSize& minSize, void SetSizeHints( const wxSize& minSize,
const wxSize& maxSize=wxDefaultSize, const wxSize& maxSize=wxDefaultSize,
const wxSize& incSize=wxDefaultSize) const wxSize& incSize=wxDefaultSize)
{ {
SetSizeHints(minSize.x, minSize.y, DoSetSizeHints(minSize.x, minSize.y,
maxSize.x, maxSize.y, maxSize.x, maxSize.y,
incSize.x, incSize.y); incSize.x, incSize.y);
} }
virtual void DoSetSizeHints(int minW, int minH,
int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
int incW = wxDefaultCoord, int incH = wxDefaultCoord );
virtual void SetVirtualSizeHints( int minW, int minH, virtual void SetVirtualSizeHints( int minW, int minH,
int maxW = wxDefaultCoord, int maxH = wxDefaultCoord ); int maxW = wxDefaultCoord, int maxH = wxDefaultCoord );

7
include/wx/x11/window.h
View File

@@ -82,13 +82,10 @@ public:
virtual void ScrollWindow( int dx, int dy, virtual void ScrollWindow( int dx, int dy,
const wxRect* rect = (wxRect *) NULL ); const wxRect* rect = (wxRect *) NULL );
virtual void SetSizeHints(int minW, int minH, virtual void DoSetSizeHints(int minW, int minH,
int maxW = -1, int maxH = -1, int maxW = -1, int maxH = -1,
int incW = -1, int incH = -1); int incW = -1, int incH = -1);
void SetSizeHints( const wxSize& minSize,
const wxSize& maxSize=wxDefaultSize,
const wxSize& incSize=wxDefaultSize)
{ wxWindowBase::SetSizeHints(minSize, maxSize, incSize); }
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual void SetDropTarget( wxDropTarget *dropTarget );
#endif // wxUSE_DRAG_AND_DROP #endif // wxUSE_DRAG_AND_DROP