Warning fixes after recent library changes.

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

diff --git a/contrib/src/fl/panedrawpl.cpp b/contrib/src/fl/panedrawpl.cpp
index b5b06d3880ebb25c20d1a7004e2381e53872566b..f07c30da89f7c14eeaba245324113375c179bba8 100644 (file)
--- a/contrib/src/fl/panedrawpl.cpp
+++ b/contrib/src/fl/panedrawpl.cpp
@@ -6,7 +6,7 @@
 // Created:     06/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
 // Created:     06/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -103,17 +103,17 @@ END_EVENT_TABLE()
 
 cbPaneDrawPlugin::cbPaneDrawPlugin(void)
 
 
 cbPaneDrawPlugin::cbPaneDrawPlugin(void)
 

-    : mResizeStarted          ( FALSE ),
+    : mResizeStarted          ( false ),

 
 

-      mResizeCursorOn         ( FALSE ),
+      mResizeCursorOn         ( false ),

       mpDraggedBar              ( NULL  ),
       mpResizedRow            ( NULL  ),
 
       mpDraggedBar              ( NULL  ),
       mpResizedRow            ( NULL  ),
 

-      mRowHandleHitted        ( FALSE ),
-      mIsUpperHandle          ( FALSE ),
-      mBarHandleHitted        ( FALSE ),
-      mIsLeftHandle           ( FALSE ),
-      mBarContentHitted       ( FALSE ),
+      mRowHandleHitted        ( false ),
+      mIsUpperHandle          ( false ),
+      mBarHandleHitted        ( false ),
+      mIsLeftHandle           ( false ),
+      mBarContentHitted       ( false ),

 
       mpClntDc ( NULL ),
       mpPane   ( NULL )
 
       mpClntDc ( NULL ),
       mpPane   ( NULL )


@@ -125,17 +125,17 @@ cbPaneDrawPlugin::cbPaneDrawPlugin( wxFrameLayout* pPanel, int paneMask )
     
       // bar-row resizing state varaibles
 
     
       // bar-row resizing state varaibles
 

-      mResizeStarted          ( FALSE ),
+      mResizeStarted          ( false ),

 
 

-      mResizeCursorOn         ( FALSE ),
+      mResizeCursorOn         ( false ),

       mpDraggedBar              ( NULL ),
       mpResizedRow            ( NULL ),
 
       mpDraggedBar              ( NULL ),
       mpResizedRow            ( NULL ),
 

-      mRowHandleHitted        ( FALSE ),
-      mIsUpperHandle          ( FALSE ),
-      mBarHandleHitted        ( FALSE ),
-      mIsLeftHandle           ( FALSE ),
-      mBarContentHitted       ( FALSE ),
+      mRowHandleHitted        ( false ),
+      mIsUpperHandle          ( false ),
+      mBarHandleHitted        ( false ),
+      mIsLeftHandle           ( false ),
+      mBarContentHitted       ( false ),

 
       mpClntDc ( NULL ),
       mpPane   ( NULL )
 
       mpClntDc ( NULL ),
       mpPane   ( NULL )


@@ -254,9 +254,9 @@ void cbPaneDrawPlugin::OnMouseMove( cbMotionEvent& event )
 
         bool prevWasRowHandle = mRowHandleHitted;
 
 
         bool prevWasRowHandle = mRowHandleHitted;
 

-        mBarContentHitted = FALSE;
-        mBarHandleHitted  = FALSE;
-        mRowHandleHitted  = FALSE;
+        mBarContentHitted = false;
+        mBarHandleHitted  = false;
+        mRowHandleHitted  = false;

 
         int testResult =  
             event.mpPane->HitTestPaneItems( event.mPos,        // in pane's coordiantes
 
         int testResult =  
             event.mpPane->HitTestPaneItems( event.mPos,        // in pane's coordiantes


@@ -275,11 +275,17 @@ void cbPaneDrawPlugin::OnMouseMove( cbMotionEvent& event )
                     mpLayout->ReleaseEventsFromPane( event.mpPane );
                     mpLayout->ReleaseEventsFromPlugin( this );
     
                     mpLayout->ReleaseEventsFromPane( event.mpPane );
                     mpLayout->ReleaseEventsFromPlugin( this );
     

-                    mResizeCursorOn = FALSE;
+                    mResizeCursorOn = false;

 
 

-                    mBarContentHitted = TRUE;
+                    mBarContentHitted = true;

 
 

+                    // In Windows, at least, the frame needs to have a null cursor
+                    // else child windows (such as text windows) inherit the cursor
+#if 1
+                    mpLayout->GetParentFrame().SetCursor( wxNullCursor );
+#else

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

+#endif

                 }
 
                 // TBD:: fire something like "mouse-over-bar" event
                 }
 
                 // TBD:: fire something like "mouse-over-bar" event


@@ -288,7 +294,7 @@ void cbPaneDrawPlugin::OnMouseMove( cbMotionEvent& event )
                 return;
             }
 
                 return;
             }
 

-            wxCursor* pCurs = NULL;
+            wxCursor* pCurs;

 
             if ( testResult == CB_UPPER_ROW_HANDLE_HITTED ||
                  testResult == CB_LOWER_ROW_HANDLE_HITTED)
 
             if ( testResult == CB_UPPER_ROW_HANDLE_HITTED ||
                  testResult == CB_LOWER_ROW_HANDLE_HITTED)


@@ -299,7 +305,7 @@ void cbPaneDrawPlugin::OnMouseMove( cbMotionEvent& event )
                 else
                     pCurs = mpLayout->mpHorizCursor;
 
                 else
                     pCurs = mpLayout->mpHorizCursor;
 

-                mRowHandleHitted = TRUE;
+                mRowHandleHitted = true;

                 mIsUpperHandle    = ( testResult == CB_UPPER_ROW_HANDLE_HITTED );
             }
             else
                 mIsUpperHandle    = ( testResult == CB_UPPER_ROW_HANDLE_HITTED );
             }
             else


@@ -312,7 +318,7 @@ void cbPaneDrawPlugin::OnMouseMove( cbMotionEvent& event )
                 else
                     pCurs = mpLayout->mpVertCursor;
 
                 else
                     pCurs = mpLayout->mpVertCursor;
 

-                mBarHandleHitted = TRUE;
+                mBarHandleHitted = true;

                 mIsLeftHandle    = ( testResult == CB_LEFT_BAR_HANDLE_HITTED );
             }
 
                 mIsLeftHandle    = ( testResult == CB_LEFT_BAR_HANDLE_HITTED );
             }
 


@@ -320,17 +326,17 @@ 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;

 
             // handled is being dragged now, thus event is "eaten" by this plugin
 
 
             // handled is being dragged now, thus event is "eaten" by this plugin
 


@@ -344,9 +350,15 @@ void cbPaneDrawPlugin::OnMouseMove( cbMotionEvent& event )
             mpLayout->ReleaseEventsFromPane( event.mpPane );
             mpLayout->ReleaseEventsFromPlugin( this );
 
             mpLayout->ReleaseEventsFromPane( event.mpPane );
             mpLayout->ReleaseEventsFromPlugin( this );
 

+            // In Windows, at least, the frame needs to have a null cursor
+            // else child windows (such as text windows) inherit the cursor
+#if 1
+            mpLayout->GetParentFrame().SetCursor( wxNullCursor );
+#else

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

+#endif

 
 

-            mResizeCursorOn = FALSE;
+            mResizeCursorOn = false;

         }
 
         event.Skip(); // pass event to the next plugin
         }
 
         event.Skip(); // pass event to the next plugin


@@ -394,14 +406,14 @@ void cbPaneDrawPlugin::OnLButtonDown( cbLeftDownEvent& event )
 
     if ( mResizeCursorOn )
     {
 
     if ( mResizeCursorOn )
     {

-        mResizeStarted = TRUE;
+        mResizeStarted = true;

         mDragOrigin    = event.mPos;
         
         // setup constraints for the dragging handle
 
         int from, till;
         mHandleOfs        = 0;
         mDragOrigin    = event.mPos;
         
         // setup constraints for the dragging handle
 
         int from, till;
         mHandleOfs        = 0;

-        mHandleIsVertical = FALSE;
+        mHandleIsVertical = false;

 
         if ( mRowHandleHitted )
 
 
         if ( mRowHandleHitted )
 


@@ -412,7 +424,7 @@ void cbPaneDrawPlugin::OnLButtonDown( cbLeftDownEvent& event )
          
         if ( mRowHandleHitted )
         {
          
         if ( mRowHandleHitted )
         {

-            mHandleIsVertical = ( event.mpPane->IsHorizontal() ) ? FALSE : TRUE;
+            mHandleIsVertical = ( event.mpPane->IsHorizontal() ) ? false : true;

 
             mHandleDragArea.x      = 0;
             mHandleDragArea.width  = event.mpPane->mPaneWidth;
 
             mHandleDragArea.x      = 0;
             mHandleDragArea.width  = event.mpPane->mPaneWidth;


@@ -435,7 +447,7 @@ void cbPaneDrawPlugin::OnLButtonDown( cbLeftDownEvent& event )
 //            cbRowInfo& rowInfo     = *mpDraggedBar->mpRow;
             wxRect& bounds         = mpDraggedBar->mBounds;
 
 //            cbRowInfo& rowInfo     = *mpDraggedBar->mpRow;
             wxRect& bounds         = mpDraggedBar->mBounds;
 

-            mHandleIsVertical = ( event.mpPane->IsHorizontal() ) ? TRUE : FALSE;
+            mHandleIsVertical = ( event.mpPane->IsHorizontal() ) ? true : false;

 
             mHandleDragArea.x      = from;
             mHandleDragArea.width  = till - from;
 
             mHandleDragArea.x      = from;
             mHandleDragArea.width  = till - from;


@@ -493,13 +505,19 @@ void cbPaneDrawPlugin::OnLButtonUp( cbLeftUpEvent& event )
     {
         DrawDraggedHandle( event.mPos, *event.mpPane );
 
     {
         DrawDraggedHandle( event.mPos, *event.mpPane );
 

-        mResizeStarted  = FALSE;
-        mResizeCursorOn = FALSE;
+        mResizeStarted  = false;
+        mResizeCursorOn = false;

 
         mpLayout->ReleaseEventsFromPane( event.mpPane );
         mpLayout->ReleaseEventsFromPlugin( this );
 
 
         mpLayout->ReleaseEventsFromPane( event.mpPane );
         mpLayout->ReleaseEventsFromPlugin( this );
 

+        // In Windows, at least, the frame needs to have a null cursor
+        // else child windows (such as text windows) inherit the cursor
+#if 1
+        mpLayout->GetParentFrame().SetCursor( wxNullCursor );
+#else

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

+#endif

 
         if ( mRowHandleHitted )
         {
 
         if ( mRowHandleHitted )
         {


@@ -573,20 +591,24 @@ void cbPaneDrawPlugin::OnSizeBarWindow( cbSizeBarWndEvent& event )
 
         // FIXME:: +/- 1s
 
 
         // FIXME:: +/- 1s
 

+        int nNewHeight = bounds.height - 2 - bar.mDimInfo.mVertGap *2;
+        if(nNewHeight < 0)
+           nNewHeight = 0;
+

         bar.mpBarWnd->wxWindow::SetSize( bounds.x      + 1 + bar.mDimInfo.mHorizGap,     
                                          bounds.y      + 1 + bar.mDimInfo.mVertGap,
                                          bounds.width  - 2 - bar.mDimInfo.mHorizGap*2,
         bar.mpBarWnd->wxWindow::SetSize( bounds.x      + 1 + bar.mDimInfo.mHorizGap,     
                                          bounds.y      + 1 + bar.mDimInfo.mVertGap,
                                          bounds.width  - 2 - bar.mDimInfo.mHorizGap*2,

-                                         bounds.height - 2 - bar.mDimInfo.mVertGap *2 , 
+                                         nNewHeight,

                                          0 
                                        );
 
         if ( !bar.mpBarWnd->IsShown() )
 
                                          0 
                                        );
 
         if ( !bar.mpBarWnd->IsShown() )
 

-            bar.mpBarWnd->Show( TRUE );
+            bar.mpBarWnd->Show( true );

     }
     else
         // hide bar if not visible
     }
     else
         // hide bar if not visible

-        bar.mpBarWnd->Show( FALSE );
+        bar.mpBarWnd->Show( false );

 
     event.Skip(); // pass event to the next plugin in the chain
 }
 
     event.Skip(); // pass event to the next plugin in the chain
 }


@@ -1254,7 +1276,7 @@ void cbPaneDrawPlugin::OnStartDrawInArea( cbStartDrawInAreaEvent& event )
                                  event.mArea.width, event.mArea.height );
 }
 
                                  event.mArea.width, event.mArea.height );
 }
 

-void cbPaneDrawPlugin::OnFinishDrawInArea( cbFinishDrawInAreaEvent& event )
+void cbPaneDrawPlugin::OnFinishDrawInArea( cbFinishDrawInAreaEvent& WXUNUSED(event) )

 {
     // DBG::
     wxASSERT( mpClntDc );
 {
     // DBG::
     wxASSERT( mpClntDc );