added .chm support for Unix (Markus Sinner)

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

diff --git a/contrib/src/fl/controlbar.cpp b/contrib/src/fl/controlbar.cpp
index 6d6a930fdce1af14ef086e1c2eda22b8e9eb6cfa..780f9960f8659be59f01b7be602606d3ae878b4b 100644 (file)
--- a/contrib/src/fl/controlbar.cpp
+++ b/contrib/src/fl/controlbar.cpp
@@ -402,11 +402,11 @@ void wxFrameLayout::ReparentWindow( wxWindow* pChild, wxWindow* pNewParent )
 
 void wxFrameLayout::DestroyBarWindows()
 {
 
 void wxFrameLayout::DestroyBarWindows()
 {

-    wxNode* pSpy = mBarSpyList.First();
+    wxNode* pSpy = mBarSpyList.GetFirst();

 
     while( pSpy )
     {
 
     while( pSpy )
     {

-        cbBarSpy& spy = *((cbBarSpy*)pSpy->Data());
+        cbBarSpy& spy = *((cbBarSpy*)pSpy->GetData());

 
         if ( spy.mpBarWnd->GetEventHandler() == &spy )
 
 
         if ( spy.mpBarWnd->GetEventHandler() == &spy )
 


@@ -414,7 +414,7 @@ void wxFrameLayout::DestroyBarWindows()
 
         delete &spy;
 
 
         delete &spy;
 

-        pSpy = pSpy->Next();
+        pSpy = pSpy->GetNext();

     }
 
     mBarSpyList.Clear();
     }
 
     mBarSpyList.Clear();


@@ -432,15 +432,15 @@ void wxFrameLayout::DestroyBarWindows()
 
 void wxFrameLayout::ShowFloatedWindows( bool show )
 {
 
 void wxFrameLayout::ShowFloatedWindows( bool show )
 {

-    wxNode* pNode = mFloatedFrames.First();
+    wxNode* pNode = mFloatedFrames.GetFirst();

 
     while( pNode )
     {
 
     while( pNode )
     {

-        cbFloatedBarWindow* pFFrm = ((cbFloatedBarWindow*)pNode->Data());
+        cbFloatedBarWindow* pFFrm = ((cbFloatedBarWindow*)pNode->GetData());

 
         pFFrm->Show( show );
 
 
         pFFrm->Show( show );
 

-        pNode = pNode->Next();
+        pNode = pNode->GetNext();

     }
 }
 
     }
 }
 


@@ -491,11 +491,11 @@ wxFrameLayout::~wxFrameLayout()
     if ( mpNECursor     ) 
         delete mpNECursor;
 
     if ( mpNECursor     ) 
         delete mpNECursor;
 

-    wxNode* pSpy = mBarSpyList.First();
+    wxNode* pSpy = mBarSpyList.GetFirst();

 
     while( pSpy )
     {
 
     while( pSpy )
     {

-        cbBarSpy& spy = *((cbBarSpy*)pSpy->Data());
+        cbBarSpy& spy = *((cbBarSpy*)pSpy->GetData());

 
         if ( spy.mpBarWnd->GetEventHandler() == &spy )
 
 
         if ( spy.mpBarWnd->GetEventHandler() == &spy )
 


@@ -503,7 +503,7 @@ wxFrameLayout::~wxFrameLayout()
 
         delete &spy;
 
 
         delete &spy;
 

-        pSpy = pSpy->Next();
+        pSpy = pSpy->GetNext();

     }
 
     for ( i = 0; i != mAllBars.Count(); ++i )
     }
 
     for ( i = 0; i != mAllBars.Count(); ++i )


@@ -715,11 +715,11 @@ void wxFrameLayout::SetBarState( cbBarInfo* pBar, int newState, bool updateNow )
         {
             pBar->mpBarWnd->Show(FALSE); // to avoid flicker upon reparenting
 
         {
             pBar->mpBarWnd->Show(FALSE); // to avoid flicker upon reparenting
 

-            wxNode* pNode = mFloatedFrames.First();
+            wxNode* pNode = mFloatedFrames.GetFirst();

 
             while( pNode )
             {
 
             while( pNode )
             {

-                cbFloatedBarWindow* pFFrm = ((cbFloatedBarWindow*)pNode->Data());
+                cbFloatedBarWindow* pFFrm = ((cbFloatedBarWindow*)pNode->GetData());

 
                 if ( pFFrm->GetBar() == pBar )
                 {
 
                 if ( pFFrm->GetBar() == pBar )
                 {


@@ -739,7 +739,7 @@ void wxFrameLayout::SetBarState( cbBarInfo* pBar, int newState, bool updateNow )
                     pFFrm->Destroy(); break;
                 }
 
                     pFFrm->Destroy(); break;
                 }
 

-                pNode = pNode->Next();
+                pNode = pNode->GetNext();

             }
 
             // FOR NOW:: excessive!
             }
 
             // FOR NOW:: excessive!


@@ -826,11 +826,11 @@ void wxFrameLayout::RepositionFloatedBar( cbBarInfo* pBar )
 {
     if ( !(mFloatingOn && pBar->mFloatingOn)) return;
 
 {
     if ( !(mFloatingOn && pBar->mFloatingOn)) return;
 

-    wxNode* pNode = mFloatedFrames.First();
+    wxNode* pNode = mFloatedFrames.GetFirst();

 
     while( pNode )
     {
 
     while( pNode )
     {

-        cbFloatedBarWindow* pFFrm = ((cbFloatedBarWindow*)pNode->Data());
+        cbFloatedBarWindow* pFFrm = ((cbFloatedBarWindow*)pNode->GetData());

 
         if ( pFFrm->GetBar() == pBar )
         {
 
         if ( pFFrm->GetBar() == pBar )
         {


@@ -848,7 +848,7 @@ void wxFrameLayout::RepositionFloatedBar( cbBarInfo* pBar )
             break;
         }
 
             break;
         }
 

-        pNode = pNode->Next();
+        pNode = pNode->GetNext();

     }
 }
 
     }
 }
 


@@ -1473,7 +1473,7 @@ void wxFrameLayout::OnPaint( wxPaintEvent& event )
     event.Skip();
 }
 
     event.Skip();
 }
 

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

 {
     // do nothing
 }
 {
     // do nothing
 }


@@ -1496,18 +1496,18 @@ void wxFrameLayout::OnIdle( wxIdleEvent& event )
 }
 
 
 }
 
 

-void wxFrameLayout::OnKillFocus( wxFocusEvent& event )
+void wxFrameLayout::OnKillFocus( wxFocusEvent& WXUNUSED(event) )

 {
     //wxMessageBox( "wxFrameLayoutGot Kill Focus!" );
     //ShowFloatedWindows( FALSE );
 }
 
 {
     //wxMessageBox( "wxFrameLayoutGot Kill Focus!" );
     //ShowFloatedWindows( FALSE );
 }
 

-void wxFrameLayout::OnSetFocus( wxFocusEvent& event )
+void wxFrameLayout::OnSetFocus( wxFocusEvent& WXUNUSED(event) )

 {
     //ShowFloatedWindows( TRUE );
 }
 
 {
     //ShowFloatedWindows( TRUE );
 }
 

-void wxFrameLayout::OnActivate( wxActivateEvent& event )
+void wxFrameLayout::OnActivate( wxActivateEvent& WXUNUSED(event) )

 {
 #if 0
     if ( event.GetActive() == FALSE )               
 {
 #if 0
     if ( event.GetActive() == FALSE )               


@@ -1622,7 +1622,7 @@ void wxFrameLayout::CaptureEventsForPlugin ( cbPluginBase* pPlugin )
 
 }
 
 
 }
 

-void wxFrameLayout::ReleaseEventsFromPlugin( cbPluginBase* pPlugin )
+void wxFrameLayout::ReleaseEventsFromPlugin( cbPluginBase* WXUNUSED(pPlugin) )

 {
     // events should be captured first
     wxASSERT( mpCaputesInput != NULL );
 {
     // events should be captured first
     wxASSERT( mpCaputesInput != NULL );


@@ -1640,7 +1640,7 @@ void wxFrameLayout::CaptureEventsForPane( cbDockPane* toPane )
     mpPaneInFocus = toPane;
 }
 
     mpPaneInFocus = toPane;
 }
 

-void wxFrameLayout::ReleaseEventsFromPane( cbDockPane* fromPane )
+void wxFrameLayout::ReleaseEventsFromPane( cbDockPane* WXUNUSED(fromPane) )

 {
     // cannot release events without capturing them
     wxASSERT( mpPaneInFocus != NULL );
 {
     // cannot release events without capturing them
     wxASSERT( mpPaneInFocus != NULL );


@@ -2128,9 +2128,9 @@ IMPLEMENT_DYNAMIC_CLASS( cbBarInfo, wxObject )
 cbBarInfo::cbBarInfo(void)
 
     : mpRow( NULL ),
 cbBarInfo::cbBarInfo(void)
 
     : mpRow( NULL ),

+      mFloatingOn( TRUE ),

       mpNext( NULL ),
       mpNext( NULL ),

-      mpPrev( NULL ),
-      mFloatingOn( TRUE )
+      mpPrev( NULL )

 {}
 
 cbBarInfo::~cbBarInfo()
 {}
 
 cbBarInfo::~cbBarInfo()


@@ -2500,7 +2500,7 @@ int cbDockPane::GetRowAt( int upperY, int lowerY )
     int range    = lowerY - upperY;
     int oneThird = range / 3;
 
     int range    = lowerY - upperY;
     int oneThird = range / 3;
 

-    wxNode* pRow = mRows.First();
+    wxNode* pRow = mRows.GetFirst();

     int row = 0;
     int curY = 0;
 
     int row = 0;
     int curY = 0;
 


@@ -2508,7 +2508,7 @@ int cbDockPane::GetRowAt( int upperY, int lowerY )
 
     while( pRow )
     {
 
     while( pRow )
     {

-        int rowHeight = GetRowHeight( (wxList*)pRow->Data() );
+        int rowHeight = GetRowHeight( (wxList*)pRow->GetData() );

 
         if ( upperY >= curY &&
              lowerY < curY ) return row;
 
         if ( upperY >= curY &&
              lowerY < curY ) return row;


@@ -2527,7 +2527,7 @@ int cbDockPane::GetRowAt( int upperY, int lowerY )
 
         ++row;
         curY += rowHeight;
 
         ++row;
         curY += rowHeight;

-        pRow = pRow->Next();
+        pRow = pRow->GetNext();

     }
     */
 
     }
     */
 


@@ -3489,10 +3489,10 @@ void cbDockPane::GetRowShapeData( cbRowInfo* pRow, wxList* pLst )
 
 void cbDockPane::SetRowShapeData( cbRowInfo* pRow, wxList* pLst )
 {
 
 void cbDockPane::SetRowShapeData( cbRowInfo* pRow, wxList* pLst )
 {

-    if ( pLst->First() == NULL )
+    if ( pLst->GetFirst() == NULL )

         return;
 
         return;
 

-    wxNode* pData = pLst->First();
+    wxNode* pData = pLst->GetFirst();

 
     size_t i;
     for ( i = 0; i != pRow->mBars.Count(); ++i )
 
     size_t i;
     for ( i = 0; i != pRow->mBars.Count(); ++i )


@@ -3501,12 +3501,12 @@ void cbDockPane::SetRowShapeData( cbRowInfo* pRow, wxList* pLst )
 
         cbBarInfo& bar = *pRow->mBars[i];;
 
 
         cbBarInfo& bar = *pRow->mBars[i];;
 

-        cbBarShapeData& data = *((cbBarShapeData*)pData->Data());
+        cbBarShapeData& data = *((cbBarShapeData*)pData->GetData());

 
         bar.mBounds   = data.mBounds;
         bar.mLenRatio = data.mLenRatio;
 
 
         bar.mBounds   = data.mBounds;
         bar.mLenRatio = data.mLenRatio;
 

-        pData = pData->Next();
+        pData = pData->GetNext();

     }
 }
 
     }
 }