GTK2 fixes (patch 966803)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/fl/controlbar.cpp b/contrib/src/fl/controlbar.cpp
index ab23f7e10e70ef60130d88a37e784c99cee03f05..98474b8271343dbe0f1516e2284f9111e6e1c715 100644 (file)
--- a/contrib/src/fl/controlbar.cpp
+++ b/contrib/src/fl/controlbar.cpp
@@ -355,6 +355,8 @@ bool wxFrameLayout::CanReparent()
 {
 #ifdef __WXMSW__
     return true;
 {
 #ifdef __WXMSW__
     return true;

+#elif defined(__WXGTK20__)
+    return TRUE;

 #elif defined (__WXGTK__)
     //return true;
     return false;
 #elif defined (__WXGTK__)
     //return true;
     return false;


@@ -390,6 +392,10 @@ void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
 #endif
     pChild->Reparent(pNewParent);
 
 #endif
     pChild->Reparent(pNewParent);
 

+    return;
+#elif defined(__WXGTK20__)
+    pChild->Reparent(pNewParent);
+

     return;
 #elif defined(__WXGTK__) || defined(__WXX11__)
     // FOR NOW:: floating with wxGtk still very buggy
     return;
 #elif defined(__WXGTK__) || defined(__WXX11__)
     // FOR NOW:: floating with wxGtk still very buggy


@@ -598,6 +604,7 @@ void wxFrameLayout::AddBar( wxWindow*        pBarWnd,
     pInfo->mName      = name;
     pInfo->mpBarWnd   = pBarWnd;
     pInfo->mDimInfo   = dimInfo;
     pInfo->mName      = name;
     pInfo->mpBarWnd   = pBarWnd;
     pInfo->mDimInfo   = dimInfo;

+    pInfo->mDimInfo.mLRUPane = alignment;

     pInfo->mState     = state;
     pInfo->mAlignment = alignment;
     pInfo->mRowNo     = rowNo;
     pInfo->mState     = state;
     pInfo->mAlignment = alignment;
     pInfo->mRowNo     = rowNo;


@@ -945,6 +952,7 @@ void wxFrameLayout::DoSetBarState( cbBarInfo* pBar )
         }
 
         pMiniFrm->Show( true );
         }
 
         pMiniFrm->Show( true );

+        RepositionFloatedBar(pMiniFrm->GetBar());

 
         // FIXME:: this is excessive
         pBar->mpBarWnd->Show(true);
 
         // FIXME:: this is excessive
         pBar->mpBarWnd->Show(true);


@@ -1814,7 +1822,8 @@ IMPLEMENT_DYNAMIC_CLASS( cbUpdateMgrData, wxObject )
 cbUpdateMgrData::cbUpdateMgrData() 
 
     : mPrevBounds( -1,-1,0,0 ),
 cbUpdateMgrData::cbUpdateMgrData() 
 
     : mPrevBounds( -1,-1,0,0 ),

-      mIsDirty( true )           // inidicate initial change
+      mIsDirty( true ),           // inidicate initial change
+      mpCustomData(0)

 {}
 
 void cbUpdateMgrData::StoreItemState( const wxRect& boundsInParent )
 {}
 
 void cbUpdateMgrData::StoreItemState( const wxRect& boundsInParent )

diff --git a/contrib/src/fl/panedrawpl.cpp b/contrib/src/fl/panedrawpl.cpp
index c89914048b99a03bd232cd9831dfbc4ece7fa68a..f07c30da89f7c14eeaba245324113375c179bba8 100644 (file)
--- a/contrib/src/fl/panedrawpl.cpp
+++ b/contrib/src/fl/panedrawpl.cpp
@@ -326,14 +326,14 @@ void cbPaneDrawPlugin::OnMouseMove( cbMotionEvent& event )
 
             if ( !mResizeCursorOn || prevWasRowHandle != mRowHandleHitted )
             {
 
             if ( !mResizeCursorOn || prevWasRowHandle != mRowHandleHitted )
             {

+                mpLayout->GetParentFrame().SetCursor( *pCurs );
+

                 if ( !mResizeCursorOn )
                 {
                     // caputre if not captured yet
                     mpLayout->CaptureEventsForPane( event.mpPane );
                     mpLayout->CaptureEventsForPlugin( this );
                 }
                 if ( !mResizeCursorOn )
                 {
                     // caputre if not captured yet
                     mpLayout->CaptureEventsForPane( event.mpPane );
                     mpLayout->CaptureEventsForPlugin( this );
                 }

-
-                mpLayout->GetParentFrame().SetCursor( *pCurs );

             }
 
             mResizeCursorOn = true;
             }
 
             mResizeCursorOn = true;

diff --git a/contrib/src/fl/toolwnd.cpp b/contrib/src/fl/toolwnd.cpp
index 0657b18c0f49efad83e467ccf4df0e3e6f398389..28fdb7880374c71ed9e1fd0361e3061216bb0420 100644 (file)
--- a/contrib/src/fl/toolwnd.cpp
+++ b/contrib/src/fl/toolwnd.cpp
@@ -360,12 +360,6 @@ void wxToolWindow::SetHintCursor( int type )
         return;
     }
 
         return;
     }
 

-    if ( !mMouseCaptured )
-    {
-        mMouseCaptured = true;
-        CaptureMouse();
-    }
-

     // did the cursor actually changed?
 
     if ( type != mCursorType )
     // did the cursor actually changed?
 
     if ( type != mCursorType )


@@ -389,6 +383,15 @@ void wxToolWindow::SetHintCursor( int type )
 
             default: break; 
         }
 
             default: break; 
         }

+
+        if (mMouseCaptured)
+            ReleaseMouse();
+    }
+
+    if ( !mMouseCaptured )
+    {
+        mMouseCaptured = true;
+        CaptureMouse();

     }
 }
 
     }
 }