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

wxFrame::GetClientSize -> DoGetClientSize

Browse Source 
Minor wxDialog fix


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-05-11 20:41:00 +00:00
parent eb082a088a
commit f924129679
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/gtk/frame.h
View File

@@ -62,8 +62,6 @@ public:
virtual bool Show( bool show ); virtual bool Show( bool show );
virtual void Centre( int direction = wxHORIZONTAL ); virtual void Centre( int direction = wxHORIZONTAL );
virtual void GetClientSize( int *width, int *height ) const;
virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0, virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
const wxString& name = _T("statusBar")); const wxString& name = _T("statusBar"));
virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id, virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
@@ -123,6 +121,7 @@ protected:
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO);
virtual void DoSetClientSize(int width, int height); virtual void DoSetClientSize(int width, int height);
virtual void DoGetClientSize( int *width, int *height ) const;
private: private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()

3
include/wx/gtk1/frame.h
View File

@@ -62,8 +62,6 @@ public:
virtual bool Show( bool show ); virtual bool Show( bool show );
virtual void Centre( int direction = wxHORIZONTAL ); virtual void Centre( int direction = wxHORIZONTAL );
virtual void GetClientSize( int *width, int *height ) const;
virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0, virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
const wxString& name = _T("statusBar")); const wxString& name = _T("statusBar"));
virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id, virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
@@ -123,6 +121,7 @@ protected:
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO);
virtual void DoSetClientSize(int width, int height); virtual void DoSetClientSize(int width, int height);
virtual void DoGetClientSize( int *width, int *height ) const;
private: private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()

2
src/gtk/dialog.cpp
View File

@@ -575,6 +575,8 @@ void wxDialog::SetIcon( const wxIcon &icon )
m_icon = icon; m_icon = icon;
if (!icon.Ok()) return; if (!icon.Ok()) return;
if (!m_widget->window) return;
wxMask *mask = icon.GetMask(); wxMask *mask = icon.GetMask();
GdkBitmap *bm = (GdkBitmap *) NULL; GdkBitmap *bm = (GdkBitmap *) NULL;
if (mask) bm = mask->GetBitmap(); if (mask) bm = mask->GetBitmap();

4
src/gtk/frame.cpp
View File

@@ -538,11 +538,11 @@ void wxFrame::Centre( int direction )
Move( x, y ); Move( x, y );
} }
void wxFrame::GetClientSize( int *width, int *height ) const void wxFrame::DoGetClientSize( int *width, int *height ) const
{ {
wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
wxWindow::GetClientSize( width, height ); wxWindow::DoGetClientSize( width, height );
if (height) if (height)
{ {
/* menu bar */ /* menu bar */

2
src/gtk1/dialog.cpp
View File

@@ -575,6 +575,8 @@ void wxDialog::SetIcon( const wxIcon &icon )
m_icon = icon; m_icon = icon;
if (!icon.Ok()) return; if (!icon.Ok()) return;
if (!m_widget->window) return;
wxMask *mask = icon.GetMask(); wxMask *mask = icon.GetMask();
GdkBitmap *bm = (GdkBitmap *) NULL; GdkBitmap *bm = (GdkBitmap *) NULL;
if (mask) bm = mask->GetBitmap(); if (mask) bm = mask->GetBitmap();

4
src/gtk1/frame.cpp
View File

@@ -538,11 +538,11 @@ void wxFrame::Centre( int direction )
Move( x, y ); Move( x, y );
} }
void wxFrame::GetClientSize( int *width, int *height ) const void wxFrame::DoGetClientSize( int *width, int *height ) const
{ {
wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") ); wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
wxWindow::GetClientSize( width, height ); wxWindow::DoGetClientSize( width, height );
if (height) if (height)
{ {
/* menu bar */ /* menu bar */