Version number updates

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

diff --git a/contrib/src/fl/toolwnd.cpp b/contrib/src/fl/toolwnd.cpp
index 28fdb7880374c71ed9e1fd0361e3061216bb0420..1d3c2f0e8f92f12abb0999d4bbe306bd5b99250f 100644 (file)
--- a/contrib/src/fl/toolwnd.cpp
+++ b/contrib/src/fl/toolwnd.cpp
@@ -76,7 +76,7 @@ enum INTERNAL_HIT_CODES
 wxToolWindow::wxToolWindow()
 
     : mpClientWnd   ( NULL ),
 wxToolWindow::wxToolWindow()
 
     : mpClientWnd   ( NULL ),

-  
+

 #ifndef __WXMSW__
     mTitleFont( 8, wxSWISS,  wxNORMAL, wxNORMAL ),
 #else
 #ifndef __WXMSW__
     mTitleFont( 8, wxSWISS,  wxNORMAL, wxNORMAL ),
 #else


@@ -96,12 +96,12 @@ wxToolWindow::wxToolWindow()
 
     mResizeStarted( false ),
     mRealTimeUpdatesOn( true ),
 
     mResizeStarted( false ),
     mRealTimeUpdatesOn( true ),

-   
+

     mMTolerance   ( 5 ), // mouse-resizing tollerance
 
     mCursorType( HITS_WND_NOTHING ),
     mMouseCaptured( false ),
     mMTolerance   ( 5 ), // mouse-resizing tollerance
 
     mCursorType( HITS_WND_NOTHING ),
     mMouseCaptured( false ),

-  
+

     mpScrDc( NULL )
 
 {
     mpScrDc( NULL )
 
 {


@@ -109,19 +109,19 @@ wxToolWindow::wxToolWindow()
 
 wxToolWindow::~wxToolWindow()
 {
 
 wxToolWindow::~wxToolWindow()
 {

-    if ( mpScrDc ) delete mpScrDc; 
+    if ( mpScrDc ) delete mpScrDc;

 
     for( size_t i = 0; i != mButtons.Count(); ++i )
         delete mButtons[i];
 }
 
 void wxToolWindow::LayoutMiniButtons()
 
     for( size_t i = 0; i != mButtons.Count(); ++i )
         delete mButtons[i];
 }
 
 void wxToolWindow::LayoutMiniButtons()

-{  
+{

     int w,h;
 
     GetSize( &w, &h );
 
     int w,h;
 
     GetSize( &w, &h );
 

-    int x = w - mWndHorizGap - mInTitleMargin - BTN_BOX_WIDTH; 
+    int x = w - mWndHorizGap - mInTitleMargin - BTN_BOX_WIDTH;

     int y = mWndVertGap + 2;
 
     for( size_t i = 0; i != mButtons.Count(); ++i )
     int y = mWndVertGap + 2;
 
     for( size_t i = 0; i != mButtons.Count(); ++i )


@@ -164,9 +164,9 @@ void wxToolWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
     int w,h;
     GetSize( &w, &h );
 
     int w,h;
     GetSize( &w, &h );
 

-    wxBrush backGround( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE), wxSOLID );
+    wxBrush backGround( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), wxSOLID );

     //dc.SetBrush( *wxLIGHT_GREY_BRUSH );
     //dc.SetBrush( *wxLIGHT_GREY_BRUSH );

-    dc.SetBrush( backGround ); 
+    dc.SetBrush( backGround );

     dc.SetPen( *wxTRANSPARENT_PEN );
 
     int y = mWndVertGap + mTitleHeight + mClntVertGap;
     dc.SetPen( *wxTRANSPARENT_PEN );
 
     int y = mWndVertGap + mTitleHeight + mClntVertGap;


@@ -249,11 +249,11 @@ int wxToolWindow::HitTestWindow( wxMouseEvent& event )
 
     int k = mMTolerance;
 
 
     int k = mMTolerance;
 

-    if ( !( pos.x >= r.x && pos.y >= r.y && 
+    if ( !( pos.x >= r.x && pos.y >= r.y &&

             pos.x < r.x + r.width &&
             pos.x < r.x + r.width &&

-            pos.y < r.y + r.height ) 
+            pos.y < r.y + r.height )

        )
        )

-        return HITS_WND_NOTHING; 
+        return HITS_WND_NOTHING;

 
     if ( pos.y <= r.y + k )
     {
 
     if ( pos.y <= r.y + k )
     {


@@ -303,7 +303,7 @@ int wxToolWindow::HitTestWindow( wxMouseEvent& event )
 
 void wxToolWindow::DrawHintRect( const wxRect& r )
 {
 
 void wxToolWindow::DrawHintRect( const wxRect& r )
 {

-    // BUG BUG BUG (wx):: somehow stippled brush works only  
+    // BUG BUG BUG (wx):: somehow stippled brush works only

     //                    when the bitmap created on stack, not
     //                    as a member of the class
 
     //                    when the bitmap created on stack, not
     //                    as a member of the class
 


@@ -381,11 +381,14 @@ void wxToolWindow::SetHintCursor( int type )
             case HITS_WND_TITLE  : SetCursor( wxCURSOR_ARROW ); break;
             case HITS_WND_CLIENT : SetCursor( wxCURSOR_ARROW ); break;
 
             case HITS_WND_TITLE  : SetCursor( wxCURSOR_ARROW ); break;
             case HITS_WND_CLIENT : SetCursor( wxCURSOR_ARROW ); break;
 

-            default: break; 
+            default: break;

         }
 
         if (mMouseCaptured)
         }
 
         if (mMouseCaptured)

+        {
+            mMouseCaptured = false;

             ReleaseMouse();
             ReleaseMouse();

+        }

     }
 
     if ( !mMouseCaptured )
     }
 
     if ( !mMouseCaptured )


@@ -395,41 +398,41 @@ void wxToolWindow::SetHintCursor( int type )
     }
 }
 
     }
 }
 

-#define INFINITY 32768
+#define FL_INFINITY 32768

 
 static inline void clip_to( int& value, long from, long till )
 {
 
 static inline void clip_to( int& value, long from, long till )
 {

-    if ( value < from ) 
+    if ( value < from )

         value = from;
 
         value = from;
 

-    if ( value > till ) 
+    if ( value > till )

         value = till;
 }
 
 void wxToolWindow::AdjustRectPos( const wxRect& original, const wxSize& newDim, wxRect& newRect )
 {
         value = till;
 }
 
 void wxToolWindow::AdjustRectPos( const wxRect& original, const wxSize& newDim, wxRect& newRect )
 {

-    if ( mCursorType == HITS_WND_TOP_EDGE || 
+    if ( mCursorType == HITS_WND_TOP_EDGE ||

          mCursorType == HITS_WND_TOP_LEFT_CORNER )
     {
         newRect.x = original.x + original.width  - newDim.x;
         newRect.y = original.y + original.height - newDim.y;
     }
     else
          mCursorType == HITS_WND_TOP_LEFT_CORNER )
     {
         newRect.x = original.x + original.width  - newDim.x;
         newRect.y = original.y + original.height - newDim.y;
     }
     else

-    if ( mCursorType == HITS_WND_LEFT_EDGE || 
+    if ( mCursorType == HITS_WND_LEFT_EDGE ||

          mCursorType == HITS_WND_BOTTOM_LEFT_CORNER )
     {
         newRect.x = original.x + original.width  - newDim.x;
         newRect.y = original.y;
     }
     else
          mCursorType == HITS_WND_BOTTOM_LEFT_CORNER )
     {
         newRect.x = original.x + original.width  - newDim.x;
         newRect.y = original.y;
     }
     else

-    if ( mCursorType == HITS_WND_RIGHT_EDGE || 
+    if ( mCursorType == HITS_WND_RIGHT_EDGE ||

          mCursorType == HITS_WND_TOP_RIGHT_CORNER )
     {
         newRect.x = original.x;
         newRect.y = original.y + original.height - newDim.y;
     }
     else
          mCursorType == HITS_WND_TOP_RIGHT_CORNER )
     {
         newRect.x = original.x;
         newRect.y = original.y + original.height - newDim.y;
     }
     else

-    if ( mCursorType == HITS_WND_BOTTOM_EDGE || 
+    if ( mCursorType == HITS_WND_BOTTOM_EDGE ||

          mCursorType == HITS_WND_BOTTOM_RIGHT_CORNER )
     {
         newRect.x = original.x;
          mCursorType == HITS_WND_BOTTOM_RIGHT_CORNER )
     {
         newRect.x = original.x;


@@ -461,44 +464,44 @@ void wxToolWindow::CalcResizedRect( wxRect& rect, wxPoint& delta, const wxSize&
         default: break;
     }
 
         default: break;
     }
 

-    if ( mCursorType == HITS_WND_TOP_EDGE || 
+    if ( mCursorType == HITS_WND_TOP_EDGE ||

          mCursorType == HITS_WND_TOP_LEFT_CORNER )
     {
         left += delta.x;
         top  += delta.y;
 
          mCursorType == HITS_WND_TOP_LEFT_CORNER )
     {
         left += delta.x;
         top  += delta.y;
 

-        clip_to( left, -INFINITY, mInitialRect.x + mInitialRect.width  - minDim.x  );
-        clip_to( top,  -INFINITY, mInitialRect.y + mInitialRect.height - minDim.y );
+        clip_to( left, -FL_INFINITY, mInitialRect.x + mInitialRect.width  - minDim.x  );
+        clip_to( top,  -FL_INFINITY, mInitialRect.y + mInitialRect.height - minDim.y );

     }
     else
     }
     else

-    if ( mCursorType == HITS_WND_LEFT_EDGE || 
+    if ( mCursorType == HITS_WND_LEFT_EDGE ||

          mCursorType == HITS_WND_BOTTOM_LEFT_CORNER )
     {
         left   += delta.x;
         bottom += delta.y;
 
          mCursorType == HITS_WND_BOTTOM_LEFT_CORNER )
     {
         left   += delta.x;
         bottom += delta.y;
 

-        clip_to( left,    -INFINITY, mInitialRect.x + mInitialRect.width  - minDim.x  );
-        clip_to( bottom,  mInitialRect.y + minDim.y, INFINITY );
+        clip_to( left,    -FL_INFINITY, mInitialRect.x + mInitialRect.width  - minDim.x  );
+        clip_to( bottom,  mInitialRect.y + minDim.y, FL_INFINITY );

     }
     else
     }
     else

-    if ( mCursorType == HITS_WND_RIGHT_EDGE || 
+    if ( mCursorType == HITS_WND_RIGHT_EDGE ||

         mCursorType == HITS_WND_TOP_RIGHT_CORNER )
     {
         right += delta.x;
         top   += delta.y;
 
         mCursorType == HITS_WND_TOP_RIGHT_CORNER )
     {
         right += delta.x;
         top   += delta.y;
 

-        clip_to( right, mInitialRect.x + minDim.x, INFINITY );
-        clip_to( top,   -INFINITY, mInitialRect.y + mInitialRect.height - minDim.y );
+        clip_to( right, mInitialRect.x + minDim.x, FL_INFINITY );
+        clip_to( top,   -FL_INFINITY, mInitialRect.y + mInitialRect.height - minDim.y );

     }
     else
     }
     else

-    if ( mCursorType == HITS_WND_BOTTOM_EDGE || 
+    if ( mCursorType == HITS_WND_BOTTOM_EDGE ||

          mCursorType == HITS_WND_BOTTOM_RIGHT_CORNER )
     {
         right  += delta.x;
         bottom += delta.y;
 
          mCursorType == HITS_WND_BOTTOM_RIGHT_CORNER )
     {
         right  += delta.x;
         bottom += delta.y;
 

-        clip_to( right,  mInitialRect.x + minDim.x,  INFINITY );
-        clip_to( bottom, mInitialRect.y + minDim.y, INFINITY );
+        clip_to( right,  mInitialRect.x + minDim.x,  FL_INFINITY );
+        clip_to( bottom, mInitialRect.y + minDim.y, FL_INFINITY );

     }
     else
     {
     }
     else
     {


@@ -554,7 +557,7 @@ void wxToolWindow::OnMotion( wxMouseEvent& event )
         wxSize borderDim( ( mWndHorizGap + mClntHorizGap )*2,
                           ( mWndVertGap  + mClntVertGap  )*2 + mTitleHeight );
 
         wxSize borderDim( ( mWndHorizGap + mClntHorizGap )*2,
                           ( mWndVertGap  + mClntVertGap  )*2 + mTitleHeight );
 

-        wxSize preferred = GetPreferredSize( wxSize( newRect.width  - borderDim.x, 
+        wxSize preferred = GetPreferredSize( wxSize( newRect.width  - borderDim.x,

                                              newRect.height - borderDim.y ) );
 
         preferred.x += borderDim.x;
                                              newRect.height - borderDim.y ) );
 
         preferred.x += borderDim.x;


@@ -591,8 +594,8 @@ void wxToolWindow::OnLeftDown( wxMouseEvent& event )
     {
         mButtons[i]->OnLeftDown( wxPoint( event.m_x, event.m_y ) );
 
     {
         mButtons[i]->OnLeftDown( wxPoint( event.m_x, event.m_y ) );
 

-        if ( mButtons[i]->IsPressed() ) 
-            return; // button hitted, 
+        if ( mButtons[i]->IsPressed() )
+            return; // button hitted,

     }
 
     if ( result >= HITS_WND_LEFT_EDGE || result == HITS_WND_TITLE )
     }
 
     if ( result >= HITS_WND_LEFT_EDGE || result == HITS_WND_TITLE )


@@ -606,7 +609,7 @@ void wxToolWindow::OnLeftDown( wxMouseEvent& event )
             mMouseCaptured = false;
         }*/
 
             mMouseCaptured = false;
         }*/
 

-        if ( result == HITS_WND_TITLE && 
+        if ( result == HITS_WND_TITLE &&

              HandleTitleClick( event ) )
             return;
 
              HandleTitleClick( event ) )
             return;
 


@@ -648,7 +651,7 @@ void wxToolWindow::OnLeftUp( wxMouseEvent& event )
         }
     }
 
         }
     }
 

-    if ( mResizeStarted ) 
+    if ( mResizeStarted )

     {
         mResizeStarted = false;
 
     {
         mResizeStarted = false;
 


@@ -681,10 +684,10 @@ void wxToolWindow::OnSize( wxSizeEvent& WXUNUSED(event) )
         int x = mWndHorizGap + mClntHorizGap;
         int y = mWndVertGap  + mTitleHeight + mClntVertGap;
 
         int x = mWndHorizGap + mClntHorizGap;
         int y = mWndVertGap  + mTitleHeight + mClntVertGap;
 

-        mpClientWnd->SetSize( x-1, y-1, 
+        mpClientWnd->SetSize( x-1, y-1,

                               w - 2*(mWndHorizGap + mClntHorizGap),
                               w - 2*(mWndHorizGap + mClntHorizGap),

-                              h - y - mClntVertGap - mWndVertGap, 
-                              0  
+                              h - y - mClntVertGap - mWndVertGap,
+                              0

                             );
     }
 
                             );
     }
 


@@ -825,15 +828,15 @@ void cbMiniButton::Draw( wxDC& dc )
 
     if ( !mPressed )
     {
 
     if ( !mPressed )
     {

-        dc.DrawLine( mPos.x + 1, mPos.y + BTN_BOX_HEIGHT - 2, 
+        dc.DrawLine( mPos.x + 1, mPos.y + BTN_BOX_HEIGHT - 2,

                      mPos.x + BTN_BOX_WIDTH - 1, mPos.y + BTN_BOX_HEIGHT - 2 );
 
                      mPos.x + BTN_BOX_WIDTH - 1, mPos.y + BTN_BOX_HEIGHT - 2 );
 

-        dc.DrawLine( mPos.x + BTN_BOX_WIDTH - 2, mPos.y + 1, 
+        dc.DrawLine( mPos.x + BTN_BOX_WIDTH - 2, mPos.y + 1,

                      mPos.x + BTN_BOX_WIDTH - 2, mPos.y + BTN_BOX_HEIGHT - 1 );
     }
     else
     {
                      mPos.x + BTN_BOX_WIDTH - 2, mPos.y + BTN_BOX_HEIGHT - 1 );
     }
     else
     {

-        dc.DrawLine( mPos.x + 1, mPos.y + 1, 
+        dc.DrawLine( mPos.x + 1, mPos.y + 1,

                      mPos.x + BTN_BOX_WIDTH - 2, mPos.y + 1 );
 
         dc.DrawLine( mPos.x + 1, mPos.y + 1,
                      mPos.x + BTN_BOX_WIDTH - 2, mPos.y + 1 );
 
         dc.DrawLine( mPos.x + 1, mPos.y + 1,


@@ -845,56 +848,27 @@ void cbMiniButton::Draw( wxDC& dc )
     else
         dc.SetPen( *wxWHITE_PEN );
 
     else
         dc.SetPen( *wxWHITE_PEN );
 

-    dc.DrawLine( mPos.x, mPos.y + BTN_BOX_HEIGHT - 1,  
+    dc.DrawLine( mPos.x, mPos.y + BTN_BOX_HEIGHT - 1,

                  mPos.x + BTN_BOX_WIDTH, mPos.y + BTN_BOX_HEIGHT - 1 );
 
     dc.DrawLine( mPos.x + BTN_BOX_WIDTH - 1, mPos.y ,
                  mPos.x + BTN_BOX_WIDTH - 1, mPos.y + BTN_BOX_HEIGHT );
 }
 
                  mPos.x + BTN_BOX_WIDTH, mPos.y + BTN_BOX_HEIGHT - 1 );
 
     dc.DrawLine( mPos.x + BTN_BOX_WIDTH - 1, mPos.y ,
                  mPos.x + BTN_BOX_WIDTH - 1, mPos.y + BTN_BOX_HEIGHT );
 }
 

-bool cbMiniButton::WasClicked() 
-{ 
-    return mWasClicked; 
+bool cbMiniButton::WasClicked()
+{
+    return mWasClicked;

 }
 
 }
 

-void cbMiniButton::Reset() 
-{ 
-    mWasClicked = false; 
+void cbMiniButton::Reset()
+{
+    mWasClicked = false;

 }
 
 /***** Implementation fro class cbCloseBox *****/
 
 void cbCloseBox::Draw( wxDC& dc )
 {
 }
 
 /***** Implementation fro class cbCloseBox *****/
 
 void cbCloseBox::Draw( wxDC& dc )
 {

-#if defined(__WXGTK__) || defined(__WXX11__)
-
-    cbMiniButton::Draw( dc );
-    
-    wxPen pen( wxColour( 64,64,64 ) ,1, wxSOLID );
-    
-    dc.SetPen( pen );
-    
-    int width = BTN_BOX_WIDTH - 7;
-    
-    int xOfs = (mPressed) ? 4 : 3;
-    int yOfs = (mPressed) ? 4 : 3;
-
-    int one = 1;
-    for( int i = 0; i != BTN_X_WIEGHT; ++i )
-    {
-        dc.DrawLine( mPos.x + xOfs + i - one,
-                     mPos.y + yOfs - one,
-                     mPos.x + xOfs + i + width,
-                     mPos.y + yOfs + width  + one);
-    
-        dc.DrawLine( mPos.x + xOfs + i + width ,
-                     mPos.y + yOfs - one - one,
-                     mPos.x + xOfs + i - one,
-                     mPos.y + yOfs + width );
-    }
-    
-#else
-

     cbMiniButton::Draw( dc );
 
     dc.SetPen( *wxBLACK_PEN );
     cbMiniButton::Draw( dc );
 
     dc.SetPen( *wxBLACK_PEN );


@@ -904,7 +878,7 @@ void cbCloseBox::Draw( wxDC& dc )
     int xOfs = (mPressed) ? 4 : 3;
     int yOfs = (mPressed) ? 4 : 3;
 
     int xOfs = (mPressed) ? 4 : 3;
     int yOfs = (mPressed) ? 4 : 3;
 

-    for( int i = 0; i != BTN_X_WIEGHT; ++i )
+    for( int i = 0; i != BTN_X_WEIGHT; ++i )

     {
         dc.DrawLine( mPos.x + xOfs + i,
                      mPos.y + yOfs,
     {
         dc.DrawLine( mPos.x + xOfs + i,
                      mPos.y + yOfs,


@@ -916,9 +890,6 @@ void cbCloseBox::Draw( wxDC& dc )
                      mPos.x + xOfs + i - 1,
                      mPos.y + yOfs + width );
     }
                      mPos.x + xOfs + i - 1,
                      mPos.y + yOfs + width );
     }

-
-#endif
-

 }
 
 /***** Implementation fro class cbCollapseBox *****/
 }
 
 /***** Implementation fro class cbCollapseBox *****/


@@ -1047,8 +1018,8 @@ void cbFloatedBarWindow::PositionFloatedWnd( int scrX,  int scrY,
 {
     wxSize minDim = GetMinimalWndDim();
 
 {
     wxSize minDim = GetMinimalWndDim();
 

-    SetSize( scrX - mWndHorizGap - mClntHorizGap, 
-             scrY - mClntVertGap - mTitleHeight - mWndVertGap, 
+    SetSize( scrX - mWndHorizGap - mClntHorizGap,
+             scrY - mClntVertGap - mTitleHeight - mWndVertGap,

              width + minDim.x, height + minDim.y, 0 );
 }
 
              width + minDim.x, height + minDim.y, 0 );
 }
 


@@ -1068,7 +1039,7 @@ wxSize cbFloatedBarWindow::GetPreferredSize( const wxSize& given )
     }
     else
     {
     }
     else
     {

-        if ( mpBar->IsFixed() ) 
+        if ( mpBar->IsFixed() )

             return mpBar->mDimInfo.mSizes[ wxCBAR_FLOATING ];
         else
             return given; // not-fixed bars are resized exactly the way user wants
             return mpBar->mDimInfo.mSizes[ wxCBAR_FLOATING ];
         else
             return given; // not-fixed bars are resized exactly the way user wants


@@ -1124,7 +1095,7 @@ bool cbFloatedBarWindow::HandleTitleClick( wxMouseEvent& event )
     bounds.width  = w;
     bounds.height = h;
 
     bounds.width  = w;
     bounds.height = h;
 

-    cbStartBarDraggingEvent dragEvt( mpBar, wxPoint(msX,msY), 
+    cbStartBarDraggingEvent dragEvt( mpBar, wxPoint(msX,msY),

                                      mpLayout->GetPanesArray()[FL_ALIGN_TOP] );
 
     mpLayout->FirePluginEvent( dragEvt );
                                      mpLayout->GetPanesArray()[FL_ALIGN_TOP] );
 
     mpLayout->FirePluginEvent( dragEvt );