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

Changed to use new wxWindow->Reparent call to allow build with current cvs

Browse Source 
Added several small fixes from Scott Pleiter


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
J. Russell Smyth
1999-07-14 17:31:42 +00:00
parent 0e1ead0ef2
commit 52d802ebb8
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
utils/framelayout/src/controlbar.cpp
View File

@@ -331,6 +331,7 @@ bool wxFrameLayout::CanReparent()
void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent ) void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
{ {
#ifdef __WXMSW__ #ifdef __WXMSW__
#if 0
if ( pChild->GetParent() ) if ( pChild->GetParent() )
{ {
@@ -344,6 +345,8 @@ void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
pNewParent->GetChildren().Append( pChild ); pNewParent->GetChildren().Append( pChild );
pChild->SetParent( pNewParent ); pChild->SetParent( pNewParent );
#endif
pChild->Reparent(pNewParent);
return; return;
#endif #endif
@@ -795,7 +798,7 @@ void wxFrameLayout::DoSetBarState( cbBarInfo* pBar )
pMiniFrm->Create( &GetParentFrame(), -1, pBar->mName, pMiniFrm->Create( &GetParentFrame(), -1, pBar->mName,
wxPoint( 50,50 ), wxPoint( 50,50 ),
wxSize ( 0, 0 ), wxSize ( 0, 0 ),
wxSTAY_ON_TOP //| wxTHICK_FRAME wxFRAME_FLOAT_ON_PARENT | wxFRAME_TOOL_WINDOW
); );
pMiniFrm->SetClient( pBar->mpBarWnd ); pMiniFrm->SetClient( pBar->mpBarWnd );

1
utils/framelayout/src/toolwnd.cpp
View File

@@ -160,6 +160,7 @@ void wxToolWindow::AddMiniButton( cbMiniButton* pBtn )
void wxToolWindow::OnPaint( wxPaintEvent& event ) void wxToolWindow::OnPaint( wxPaintEvent& event )
{ {
wxPaintDC pdc( this );
wxWindowDC dc( this ); wxWindowDC dc( this );
int w,h; int w,h;