Applied David's fix for not autoconf-ing on RHL8

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

diff --git a/contrib/src/fl/toolwnd.cpp b/contrib/src/fl/toolwnd.cpp
index 171e3df845fa770b471e43b450701b2c58c718cd..5c846c27ef430a7801941eb4cc6cf54676214b45 100644 (file)
--- a/contrib/src/fl/toolwnd.cpp
+++ b/contrib/src/fl/toolwnd.cpp
@@ -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("%d,%d / %d,%d\n", finalRect.x, finalRect.y, finalRect.width, finalRect.height);
                }
 
                mPrevHintRect = finalRect;
@@ -868,7 +869,7 @@ void cbMiniButton::Reset()
 
 void cbCloseBox::Draw( wxDC& dc )
 {
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXX11__)
 
     cbMiniButton::Draw( dc );