Committing in .

[wxWidgets.git] / src / univ / winuniv.cpp

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index a3e50aa7dd554887408b372db4a4bfb2ae64903e..cb89cc06f78df5f3bef7319d73cc75a2eb774eac 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univwindow.h"
 #endif
 
     #pragma implementation "univwindow.h"
 #endif
 


@@ -182,7 +182,7 @@ const wxBitmap& wxWindow::GetBackgroundBitmap(int *alignment,
 // ----------------------------------------------------------------------------
 
 // the event handlers executed when the window must be repainted
 // ----------------------------------------------------------------------------
 
 // the event handlers executed when the window must be repainted

-void wxWindow::OnNcPaint(wxPaintEvent& event)
+void wxWindow::OnNcPaint(wxPaintEvent& WXUNUSED(event))

 {
     if ( m_renderer )
     {
 {
     if ( m_renderer )
     {


@@ -340,7 +340,7 @@ void wxWindow::DoDrawBorder(wxDC& dc, const wxRect& rect)
     }
 }
 
     }
 }
 

-void wxWindow::DoDraw(wxControlRenderer *renderer)
+void wxWindow::DoDraw(wxControlRenderer * WXUNUSED(renderer))

 {
 }
 
 {
 }
 


@@ -393,13 +393,13 @@ void wxWindow::Refresh(bool eraseBackground, const wxRect *rectClient)
     wxWindowNative::Refresh(eraseBackground, &rectWin);
 
     // Refresh all sub controls if any.
     wxWindowNative::Refresh(eraseBackground, &rectWin);
 
     // Refresh all sub controls if any.

-    wxWindowList::Node *node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while ( node )
     {
         wxWindow *win = node->GetData();
         // Only refresh sub controls when it is visible 
         // and when it is in the update region.
     while ( node )
     {
         wxWindow *win = node->GetData();
         // Only refresh sub controls when it is visible 
         // and when it is in the update region.

-        if(win->IsShown() && wxRegion(rectWin).Contains(win->GetRect()) != wxOutRegion)
+        if(!win->IsKindOf(CLASSINFO(wxTopLevelWindow)) && win->IsShown() && wxRegion(rectWin).Contains(win->GetRect()) != wxOutRegion)

             win->Refresh(eraseBackground, &rectWin);
             
         node = node->GetNext();
             win->Refresh(eraseBackground, &rectWin);
             
         node = node->GetNext();


@@ -891,7 +891,7 @@ void wxWindow::SetScrollbar(int orient,
     }
 }
 
     }
 }
 

-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
+void wxWindow::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))

 {
     wxScrollBar *scrollbar = GetScrollbar(orient);
     wxCHECK_RET( scrollbar, _T("no scrollbar to set position for") );
 {
     wxScrollBar *scrollbar = GetScrollbar(orient);
     wxCHECK_RET( scrollbar, _T("no scrollbar to set position for") );


@@ -954,7 +954,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
     // scroll children accordingly:
     wxPoint offset(dx, dy);
 
     // scroll children accordingly:
     wxPoint offset(dx, dy);
 

-    for (wxWindowList::Node *node = GetChildren().GetFirst();
+    for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

          node; node = node->GetNext())
     {
         wxWindow *child = node->GetData();
          node; node = node->GetNext())
     {
         wxWindow *child = node->GetData();