X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd9396d52dc2118f2f527ecea55271e79a893ed4..ff1865910312d960737474a75a77737d5ce94864:/utils/framelayout/src/controlbar.cpp

diff --git a/utils/framelayout/src/controlbar.cpp b/utils/framelayout/src/controlbar.cpp
index 9dcd33dea2..d2401b700b 100644
--- a/utils/framelayout/src/controlbar.cpp
+++ b/utils/framelayout/src/controlbar.cpp
@@ -232,11 +232,11 @@ wxFrameLayout::wxFrameLayout(void)
 	: mpFrame      ( NULL ),
 	  mpFrameClient( NULL ),
 
-	  mDarkPen  ( wxColour(128,128,128), 1, wxSOLID ),
-	  mLightPen ( wxColour(255,255,255), 1, wxSOLID ),
-	  mGrayPen  ( wxColour(192,192,192), 1, wxSOLID ),
+	  mDarkPen  ( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID ),
+	  mLightPen ( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT), 1, wxSOLID ),
+	  mGrayPen  ( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
 	  mBlackPen ( wxColour(  0,  0,  0), 1, wxSOLID ),
-	  mBorderPen( wxColour(192,192,192), 1, wxSOLID ),
+	  mBorderPen( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
 
 	  mpPaneInFocus( NULL ),
 	  mpLRUPane    ( NULL ),
@@ -245,9 +245,9 @@ wxFrameLayout::wxFrameLayout(void)
 
 	  mpTopPlugin   ( NULL ),
 	  mpCaputesInput( NULL ),
-	  mRecalcPending( TRUE ),
 
 	  mCheckFocusWhenIdle( FALSE ),
+	  mRecalcPending( TRUE ),
 	  mClientWndRefreshPending( FALSE )
 {
 	CreateCursors();
@@ -264,11 +264,11 @@ wxFrameLayout::wxFrameLayout( wxWindow* pParentFrame, wxWindow* pFrameClient, bo
 	: mpFrame( pParentFrame ),
 	  mpFrameClient(pFrameClient),
 
-	  mDarkPen  ( wxColour(128,128,128), 1, wxSOLID ),
-	  mLightPen ( wxColour(255,255,255), 1, wxSOLID ),
-	  mGrayPen  ( wxColour(192,192,192), 1, wxSOLID ),
+	  mDarkPen  ( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW), 1, wxSOLID ),
+	  mLightPen ( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT), 1, wxSOLID ),
+	  mGrayPen  ( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
 	  mBlackPen ( wxColour(  0,  0,  0), 1, wxSOLID ),
-	  mBorderPen( wxColour(192,192,192), 1, wxSOLID ),
+	  mBorderPen( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE), 1, wxSOLID ),
 
 	  mpPaneInFocus( NULL ),
 	  mpLRUPane    ( NULL ),
@@ -301,7 +301,7 @@ wxFrameLayout::wxFrameLayout( wxWindow* pParentFrame, wxWindow* pFrameClient, bo
 		// DBG:: set RED color of frame's background for the
 		//       prurpose of tracking engine bugs "visually"
 
-		GetParentFrame().SetBackgroundColour( wxColour(192,192,192) );
+		GetParentFrame().SetBackgroundColour( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) );
 	}
 
 	mFloatingOn = CanReparent();
@@ -331,19 +331,22 @@ bool wxFrameLayout::CanReparent()
 void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
 {
 #ifdef __WXMSW__
+#if 0
 
 	if ( pChild->GetParent() )
 	{
-		bool success = pChild->GetParent()->GetChildren()->DeleteObject( pChild );
+		bool success = pChild->GetParent()->GetChildren().DeleteObject( pChild );
 
 		wxASSERT( success ); // DBG::
 	}
 
 	::SetParent( (HWND)pChild->m_hWnd, (HWND)pNewParent->m_hWnd  );
 
-	pNewParent->GetChildren()->Append( pChild );
+	pNewParent->GetChildren().Append( pChild );
 
 	pChild->SetParent( pNewParent );
+#endif
+    pChild->Reparent(pNewParent);
 
 	return;
 #endif
@@ -354,9 +357,9 @@ void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
 
 	return;
 
-	pChild->ReParent( pNewParent );
+	//pChild->ReParent( pNewParent );
 
-	return;
+	//return;
 #endif
 	
 	wxMessageBox( "Sorry, docking is not supported for ports other than MSW and wxGTK" );
@@ -795,7 +798,7 @@ void wxFrameLayout::DoSetBarState( cbBarInfo* pBar )
 		pMiniFrm->Create( &GetParentFrame(), -1, pBar->mName, 
 						  wxPoint( 50,50 ),
 						  wxSize ( 0, 0  ),
-						  wxSTAY_ON_TOP //| wxTHICK_FRAME 
+                          wxFRAME_FLOAT_ON_PARENT  |  wxFRAME_TOOL_WINDOW
 						);
 
 		pMiniFrm->SetClient( pBar->mpBarWnd );
@@ -1563,11 +1566,9 @@ void wxFrameLayout::PushDefaultPlugins()
 {
 	// FIXME:: to much of the stuff for the default...
 
-	AddPlugin( CLASSINFO( cbSimpleCustomizationPlugin ) );
 	AddPlugin( CLASSINFO( cbRowLayoutPlugin       ) );
 	AddPlugin( CLASSINFO( cbBarDragPlugin         ) );
 	AddPlugin( CLASSINFO( cbPaneDrawPlugin ) );
-	AddPlugin( CLASSINFO( cbAntiflickerPlugin     ) );
 }
 
 void wxFrameLayout::AddPlugin( wxClassInfo* pPlInfo, int paneMask )