X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7eff657c071f9df1938edb2d1b530492ccfc9489..d1a6e2b7a103d761fbc15e0e9c1c20ab53a849d9:/contrib/src/fl/toolwnd.cpp?ds=sidebyside

diff --git a/contrib/src/fl/toolwnd.cpp b/contrib/src/fl/toolwnd.cpp
index 171e3df845..f257fac5f4 100644
--- a/contrib/src/fl/toolwnd.cpp
+++ b/contrib/src/fl/toolwnd.cpp
@@ -81,7 +81,7 @@ wxToolWindow::wxToolWindow()
 	  mTitleFont( 8, wxSWISS,  wxNORMAL, wxNORMAL ),
 #else
 	  // just to simulate MS-Dev style
-	  mTitleFont( 8, wxSWISS,  wxNORMAL, wxNORMAL, FALSE, "MS Sans Serif" ),
+	  mTitleFont( 8, wxSWISS,  wxNORMAL, wxNORMAL, FALSE, wxT("MS Sans Serif") ),
 #endif
 
       mTitleHeight  ( 16 ),
@@ -157,7 +157,7 @@ void wxToolWindow::AddMiniButton( cbMiniButton* pBtn )
 	//LayoutMiniButtons();
 }
 
-void wxToolWindow::OnPaint( wxPaintEvent& event )
+void wxToolWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
     wxPaintDC pdc( this );
 	wxWindowDC dc( this );
@@ -338,21 +338,20 @@ void wxToolWindow::DrawHintRect( const wxRect& r )
 
 void wxToolWindow::SetHintCursor( int type )
 {
-	if ( mResizeStarted ) return;
+	if ( mResizeStarted )
+        return;
 
 	if ( type == HITS_WND_NOTHING || type == HITS_WND_CLIENT )
 	{
 		// the cursor is out of window - reset to arrow
 
-		if ( mMouseCaptured && !mResizeStarted )
+		if ( mMouseCaptured )
 		{
 			ReleaseMouse();
 			mMouseCaptured = FALSE;
 		}
 
-		if ( mCursorType == HITS_WND_NOTHING && !mResizeStarted )
-
-			SetCursor( wxCURSOR_ARROW );
+		SetCursor( wxCURSOR_ARROW );
 
 		mCursorType = type;
 
@@ -498,7 +497,7 @@ void wxToolWindow::CalcResizedRect( wxRect& rect, wxPoint& delta, const wxSize&
 	}
 	else
 	{
-		wxFAIL( _T("what did the cursor hit?") );
+		wxFAIL_MSG( _T("what did the cursor hit?") );
 	}
 
 	rect.x = left;
@@ -572,6 +571,8 @@ void wxToolWindow::OnMotion( wxMouseEvent& event )
 		{
 			DrawHintRect( mPrevHintRect );
 			DrawHintRect( finalRect );
+
+            ::wxLogTrace(wxT("wxToolWindow"),wxT("%d,%d / %d,%d\n"), finalRect.x, finalRect.y, finalRect.width, finalRect.height);
 		}
 
 		mPrevHintRect = finalRect;
@@ -671,7 +672,7 @@ void wxToolWindow::OnLeftUp( wxMouseEvent& event )
 	}
 }
 
-void wxToolWindow::OnSize( wxSizeEvent& event )
+void wxToolWindow::OnSize( wxSizeEvent& WXUNUSED(event) )
 {
 	if ( mpClientWnd )
 	{
@@ -696,7 +697,7 @@ wxSize wxToolWindow::GetPreferredSize( const wxSize& given )
 	return given;
 }
 
-void wxToolWindow::OnEraseBackground( wxEraseEvent& event )
+void wxToolWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )
 {
 	// nothing
 }
@@ -754,7 +755,7 @@ void cbMiniButton::OnLeftDown( const wxPoint& pos )
 	}
 }
 
-void cbMiniButton::OnLeftUp( const wxPoint& pos )
+void cbMiniButton::OnLeftUp( const wxPoint& WXUNUSED(pos) )
 {
 	if ( !mVisible || !mDragStarted ) return;
 
@@ -868,7 +869,7 @@ void cbMiniButton::Reset()
 
 void cbCloseBox::Draw( wxDC& dc )
 {
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXX11__)
 
     cbMiniButton::Draw( dc );
     
@@ -1136,7 +1137,7 @@ bool cbFloatedBarWindow::HandleTitleClick( wxMouseEvent& event )
 	return TRUE;
 }
 
-void cbFloatedBarWindow::OnDblClick( wxMouseEvent& event )
+void cbFloatedBarWindow::OnDblClick( wxMouseEvent& WXUNUSED(event) )
 {
 	mpLayout->SetBarState( mpBar, wxCBAR_DOCKED_HORIZONTALLY, TRUE );