deprecated wxString::GetWriteBuf() and friends in favour of wxStringBuffer

[wxWidgets.git] / contrib / src / fl / controlbar.cpp

diff --git a/contrib/src/fl/controlbar.cpp b/contrib/src/fl/controlbar.cpp
index 2e49eaa9e43551ec9680c9a7f89395f3eceaf1f7..4023c60b19ee1138ae9a67ec39865493aeb2eb99 100644 (file)
--- a/contrib/src/fl/controlbar.cpp
+++ b/contrib/src/fl/controlbar.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-    #pragma implementation "controlbar.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -370,26 +366,7 @@ bool wxFrameLayout::CanReparent()
 
 void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
 {
-#ifdef __WXMSW__
-#if 0
-
-    if ( pChild->GetParent() )
-    {
-        bool success = pChild->GetParent()->GetChildren().DeleteObject( pChild );
-
-        wxASSERT( success ); // DBG::
-    }
-
-    ::SetParent( (HWND)pChild->m_hWnd, (HWND)pNewParent->m_hWnd  );
-
-    pNewParent->GetChildren().Append( pChild );
-
-    pChild->SetParent( pNewParent );
-#endif
-    pChild->Reparent(pNewParent);
-
-    return;
-#elif defined(__WXGTK20__)
+#if defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXMAC__)
     pChild->Reparent(pNewParent);
 
     return;
@@ -404,7 +381,7 @@ void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
 #else
     wxUnusedVar(pChild);
     wxUnusedVar(pNewParent);
-    wxMessageBox( "Sorry, docking is not supported for ports other than MSW and wxGTK" );
+    wxMessageBox( _("Sorry, docking is not supported for ports other than wxMSW, wxMac and wxGTK") );
 #endif
 }
 
@@ -910,9 +887,7 @@ void wxFrameLayout::DoSetBarState( cbBarInfo* pBar )
         pMiniFrm->Create( &GetParentFrame(), wxID_ANY, pBar->mName,
                           wxPoint( 50,50 ),
                           wxSize ( 0, 0  ),
-                          wxFRAME_FLOAT_ON_PARENT |
-                          wxNO_BORDER |
-                          wxFRAME_NO_TASKBAR
+                          wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT
                         );
 
         pMiniFrm->SetClient( pBar->mpBarWnd );