addedd support for <pre width=...>

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

diff --git a/contrib/src/fl/toolwnd.cpp b/contrib/src/fl/toolwnd.cpp
index 621760a827dc7cd8f87b40ca23421f37fdf06365..6eeb02f0a6a4a60cd99c59aa7039bd19da0a1208 100644 (file)
--- 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 ),
 #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 ),
 #endif
 
       mTitleHeight  ( 16 ),


@@ -157,7 +157,7 @@ void wxToolWindow::AddMiniButton( cbMiniButton* pBtn )
        //LayoutMiniButtons();
 }
 
        //LayoutMiniButtons();
 }
 

-void wxToolWindow::OnPaint( wxPaintEvent& event )
+void wxToolWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )

 {
     wxPaintDC pdc( this );
        wxWindowDC dc( this );
 {
     wxPaintDC pdc( this );
        wxWindowDC dc( this );


@@ -497,7 +497,7 @@ void wxToolWindow::CalcResizedRect( wxRect& rect, wxPoint& delta, const wxSize&
        }
        else
        {
        }
        else
        {

-               wxFAIL( _T("what did the cursor hit?") );
+               wxFAIL_MSG( _T("what did the cursor hit?") );

        }
 
        rect.x = left;
        }
 
        rect.x = left;


@@ -571,6 +571,8 @@ void wxToolWindow::OnMotion( wxMouseEvent& event )
                {
                        DrawHintRect( mPrevHintRect );
                        DrawHintRect( finalRect );
                {
                        DrawHintRect( mPrevHintRect );
                        DrawHintRect( finalRect );

+
+            ::wxLogTrace(wxT("%d,%d / %d,%d\n"), finalRect.x, finalRect.y, finalRect.width, finalRect.height);

                }
 
                mPrevHintRect = finalRect;
                }
 
                mPrevHintRect = finalRect;


@@ -670,7 +672,7 @@ void wxToolWindow::OnLeftUp( wxMouseEvent& event )
        }
 }
 
        }
 }
 

-void wxToolWindow::OnSize( wxSizeEvent& event )
+void wxToolWindow::OnSize( wxSizeEvent& WXUNUSED(event) )

 {
        if ( mpClientWnd )
        {
 {
        if ( mpClientWnd )
        {


@@ -695,7 +697,7 @@ wxSize wxToolWindow::GetPreferredSize( const wxSize& given )
        return given;
 }
 
        return given;
 }
 

-void wxToolWindow::OnEraseBackground( wxEraseEvent& event )
+void wxToolWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )

 {
        // nothing
 }
 {
        // nothing
 }


@@ -753,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;
 
 {
        if ( !mVisible || !mDragStarted ) return;
 


@@ -867,7 +869,7 @@ void cbMiniButton::Reset()
 
 void cbCloseBox::Draw( wxDC& dc )
 {
 
 void cbCloseBox::Draw( wxDC& dc )
 {

-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXX11__)

 
     cbMiniButton::Draw( dc );
     
 
     cbMiniButton::Draw( dc );
     


@@ -1135,7 +1137,7 @@ bool cbFloatedBarWindow::HandleTitleClick( wxMouseEvent& event )
        return TRUE;
 }
 
        return TRUE;
 }
 

-void cbFloatedBarWindow::OnDblClick( wxMouseEvent& event )
+void cbFloatedBarWindow::OnDblClick( wxMouseEvent& WXUNUSED(event) )

 {
        mpLayout->SetBarState( mpBar, wxCBAR_DOCKED_HORIZONTALLY, TRUE );
 
 {
        mpLayout->SetBarState( mpBar, wxCBAR_DOCKED_HORIZONTALLY, TRUE );