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

I don't understand the SetIconState code in /src/frome.cpp, but

Browse Source 
I know it is wrong. This also caused the splitter window bug.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2001-06-14 16:15:29 +00:00
parent 6c28fd3379
commit f94fca1b74
4 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/frame.cpp
View File

@@ -448,7 +448,7 @@ void wxFrame::Init()
m_toolBarDetached = FALSE; m_toolBarDetached = FALSE;
m_insertInClientArea = TRUE; m_insertInClientArea = TRUE;
m_isFrame = TRUE; m_isFrame = TRUE;
m_isIconized = TRUE; m_isIconized = FALSE;
m_fsIsShowing = FALSE; m_fsIsShowing = FALSE;
m_themeEnabled = TRUE; m_themeEnabled = TRUE;
} }
@@ -1228,7 +1228,11 @@ void wxFrame::SetIconizeState(bool iconize)
{ {
// this is not supposed to happen if we're called only from // this is not supposed to happen if we're called only from
// gtk_frame_(un)map_callback! // gtk_frame_(un)map_callback!
wxFAIL_MSG( _T("unexpected call to SendIconizeEvent ignored") );
// RR: I don't understand this test. Upon startup, the frame is
// not iconized by default, it has just not been created
// yet.
///wxFAIL_MSG( _T("unexpected call to SendIconizeEvent ignored") );
} }
} }

9
src/gtk/window.cpp
View File

@@ -2616,7 +2616,7 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
wxASSERT_MSG( (m_parent != NULL), wxT("wxWindow::SetSize requires parent.\n") ); wxASSERT_MSG( (m_parent != NULL), wxT("wxWindow::SetSize requires parent.\n") );
/* /*
printf( "name %s, x,y,w,h: %d,%d,%d,%d \n", GetName().c_str(), x,y,width,height ); printf( "DoSetSize: name %s, x,y,w,h: %d,%d,%d,%d \n", GetName().c_str(), x,y,width,height );
*/ */
if (m_resizing) return; /* I don't like recursions */ if (m_resizing) return; /* I don't like recursions */
@@ -2890,6 +2890,13 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
if (width) (*width) = m_width - dw; if (width) (*width) = m_width - dw;
if (height) (*height) = m_height - dh; if (height) (*height) = m_height - dh;
} }
/*
printf( "GetClientSize, name %s ", GetName().c_str() );
if (width) printf( " width = %d", (*width) );
if (height) printf( " height = %d", (*height) );
printf( "\n" );
*/
} }
void wxWindow::DoGetPosition( int *x, int *y ) const void wxWindow::DoGetPosition( int *x, int *y ) const

8
src/gtk1/frame.cpp
View File

@@ -448,7 +448,7 @@ void wxFrame::Init()
m_toolBarDetached = FALSE; m_toolBarDetached = FALSE;
m_insertInClientArea = TRUE; m_insertInClientArea = TRUE;
m_isFrame = TRUE; m_isFrame = TRUE;
m_isIconized = TRUE; m_isIconized = FALSE;
m_fsIsShowing = FALSE; m_fsIsShowing = FALSE;
m_themeEnabled = TRUE; m_themeEnabled = TRUE;
} }
@@ -1228,7 +1228,11 @@ void wxFrame::SetIconizeState(bool iconize)
{ {
// this is not supposed to happen if we're called only from // this is not supposed to happen if we're called only from
// gtk_frame_(un)map_callback! // gtk_frame_(un)map_callback!
wxFAIL_MSG( _T("unexpected call to SendIconizeEvent ignored") );
// RR: I don't understand this test. Upon startup, the frame is
// not iconized by default, it has just not been created
// yet.
///wxFAIL_MSG( _T("unexpected call to SendIconizeEvent ignored") );
} }
} }

9
src/gtk1/window.cpp
View File

@@ -2616,7 +2616,7 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
wxASSERT_MSG( (m_parent != NULL), wxT("wxWindow::SetSize requires parent.\n") ); wxASSERT_MSG( (m_parent != NULL), wxT("wxWindow::SetSize requires parent.\n") );
/* /*
printf( "name %s, x,y,w,h: %d,%d,%d,%d \n", GetName().c_str(), x,y,width,height ); printf( "DoSetSize: name %s, x,y,w,h: %d,%d,%d,%d \n", GetName().c_str(), x,y,width,height );
*/ */
if (m_resizing) return; /* I don't like recursions */ if (m_resizing) return; /* I don't like recursions */
@@ -2890,6 +2890,13 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
if (width) (*width) = m_width - dw; if (width) (*width) = m_width - dw;
if (height) (*height) = m_height - dh; if (height) (*height) = m_height - dh;
} }
/*
printf( "GetClientSize, name %s ", GetName().c_str() );
if (width) printf( " width = %d", (*width) );
if (height) printf( " height = %d", (*height) );
printf( "\n" );
*/
} }
void wxWindow::DoGetPosition( int *x, int *y ) const void wxWindow::DoGetPosition( int *x, int *y ) const