compilation fix for wxUSE_INTL == 0 (patch 646466)

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

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index f2b90368df6acb78ba879dde8507b7212fd8ddad..afc1a6efbd6132fdee5590eddb5be3df87b881d1 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -39,6 +39,7 @@
     #include "wx/frame.h"
 #endif // WX_PRECOMP
 
     #include "wx/frame.h"
 #endif // WX_PRECOMP
 

+#include "wx/log.h"

 #include "wx/univ/colschem.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/theme.h"
 #include "wx/univ/colschem.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/theme.h"


@@ -108,7 +109,7 @@ void wxWindow::Init()
     m_isCurrent = FALSE;
 
     m_renderer = wxTheme::Get()->GetRenderer();
     m_isCurrent = FALSE;
 
     m_renderer = wxTheme::Get()->GetRenderer();

-    
+

     m_oldSize.x = -1;
     m_oldSize.y = -1;
 }
     m_oldSize.x = -1;
     m_oldSize.y = -1;
 }


@@ -239,7 +240,7 @@ void wxWindow::OnErase(wxEraseEvent& event)
 
         return;
     }
 
         return;
     }

-    
+

     DoDrawBackground(*event.GetDC());
 
     // if we have both scrollbars, we also have a square in the corner between
     DoDrawBackground(*event.GetDC());
 
     // if we have both scrollbars, we also have a square in the corner between


@@ -266,41 +267,42 @@ void wxWindow::OnErase(wxEraseEvent& event)
 bool wxWindow::DoDrawBackground(wxDC& dc)
 {
     wxRect rect;
 bool wxWindow::DoDrawBackground(wxDC& dc)
 {
     wxRect rect;

-    
+

     wxSize size = GetSize();  // Why not GetClientSize() ?
     rect.x = 0;
     rect.y = 0;
     rect.width = size.x;
     rect.height = size.y;
     wxSize size = GetSize();  // Why not GetClientSize() ?
     rect.x = 0;
     rect.y = 0;
     rect.width = size.x;
     rect.height = size.y;

-    
-    if (HasTransparentBackground() && GetParent() && GetParent()->ProvidesBackground())
+
+    wxWindow * const parent = GetParent();
+    if ( HasTransparentBackground() && parent && parent->ProvidesBackground() )

     {
         wxASSERT( !IsTopLevel() );
     {
         wxASSERT( !IsTopLevel() );

-    
+

         wxPoint pos = GetPosition();
         wxPoint pos = GetPosition();

-        
+

         AdjustForParentClientOrigin( pos.x, pos.y, 0 );
         AdjustForParentClientOrigin( pos.x, pos.y, 0 );

-        
+

         // Adjust DC logical origin
         wxCoord x,y;
         dc.GetLogicalOrigin( &x, &y );
         x += pos.x;
         y += pos.y;
         dc.SetLogicalOrigin( x, y );
         // Adjust DC logical origin
         wxCoord x,y;
         dc.GetLogicalOrigin( &x, &y );
         x += pos.x;
         y += pos.y;
         dc.SetLogicalOrigin( x, y );

-        
+

         // Adjust draw rect
         rect.x = pos.x;
         rect.y = pos.y;
         // Adjust draw rect
         rect.x = pos.x;
         rect.y = pos.y;

-        
+

         // Let parent draw the background
         // Let parent draw the background

-        GetParent()->EraseBackground( dc, rect );
+        parent->EraseBackground( dc, rect );

     }
     else
     {
         // Draw background ouselves
     }
     else
     {
         // Draw background ouselves

-         EraseBackground( dc, rect );
+        EraseBackground( dc, rect );

     }
     }

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -314,10 +316,10 @@ void wxWindow::EraseBackground(wxDC& dc, const wxRect& rect)
         wxBitmap bmp = GetBackgroundBitmap(&alignment, &stretch);
         wxControlRenderer::DrawBitmap(dc, bmp, rect, alignment, stretch);
     }
         wxBitmap bmp = GetBackgroundBitmap(&alignment, &stretch);
         wxControlRenderer::DrawBitmap(dc, bmp, rect, alignment, stretch);
     }

-    else 
+    else

     {
         // Just fill it with bg colour if no bitmap
     {
         // Just fill it with bg colour if no bitmap

-    
+

         m_renderer->DrawBackground(dc, wxTHEME_BG_COLOUR(this),
                                    rect, GetStateFlags());
     }
         m_renderer->DrawBackground(dc, wxTHEME_BG_COLOUR(this),
                                    rect, GetStateFlags());
     }


@@ -477,28 +479,28 @@ int wxWindow::GetStateFlags() const
 void wxWindow::OnSize(wxSizeEvent& event)
 {
     event.Skip();
 void wxWindow::OnSize(wxSizeEvent& event)
 {
     event.Skip();

-    
+

     if ( m_scrollbarVert || m_scrollbarHorz )
     {
         PositionScrollbars();
     }
     if ( m_scrollbarVert || m_scrollbarHorz )
     {
         PositionScrollbars();
     }

-    
+

 #if 0   // ndef __WXMSW__
     // Refresh the area (strip) previously occupied by the border
 #if 0   // ndef __WXMSW__
     // Refresh the area (strip) previously occupied by the border

-    
+

     if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE ) && IsShown())
     {
         // This code assumes that wxSizeEvent.GetSize() returns
         // the area of the entire window, not just the client
         // area.
         wxSize newSize = event.GetSize();
     if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE ) && IsShown())
     {
         // This code assumes that wxSizeEvent.GetSize() returns
         // the area of the entire window, not just the client
         // area.
         wxSize newSize = event.GetSize();

-        
+

         if (m_oldSize.x == -1 && m_oldSize.y == -1)
         {
             m_oldSize = newSize;
             return;
         }
         if (m_oldSize.x == -1 && m_oldSize.y == -1)
         {
             m_oldSize = newSize;
             return;
         }

-        
+

         if (HasFlag( wxSIMPLE_BORDER ))
         {
             if (newSize.y > m_oldSize.y)
         if (HasFlag( wxSIMPLE_BORDER ))
         {
             if (newSize.y > m_oldSize.y)


@@ -519,7 +521,7 @@ void wxWindow::OnSize(wxSizeEvent& event)
                 rect.width = newSize.x;
                 wxWindowNative::Refresh( TRUE, &rect );
             }
                 rect.width = newSize.x;
                 wxWindowNative::Refresh( TRUE, &rect );
             }

-            
+

             if (newSize.x > m_oldSize.x)
             {
                 wxRect rect;
             if (newSize.x > m_oldSize.x)
             {
                 wxRect rect;


@@ -560,7 +562,7 @@ void wxWindow::OnSize(wxSizeEvent& event)
                 rect.width = newSize.x;
                 wxWindowNative::Refresh( TRUE, &rect );
             }
                 rect.width = newSize.x;
                 wxWindowNative::Refresh( TRUE, &rect );
             }

-            
+

             if (newSize.x > m_oldSize.x)
             {
                 wxRect rect;
             if (newSize.x > m_oldSize.x)
             {
                 wxRect rect;


@@ -580,7 +582,7 @@ void wxWindow::OnSize(wxSizeEvent& event)
                 wxWindowNative::Refresh( TRUE, &rect );
             }
         }
                 wxWindowNative::Refresh( TRUE, &rect );
             }
         }

-        
+

         m_oldSize = newSize;
     }
 #endif
         m_oldSize = newSize;
     }
 #endif


@@ -914,7 +916,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 
     wxWindowNative::ScrollWindow(dx, dy, rect);
 
 
     wxWindowNative::ScrollWindow(dx, dy, rect);
 

-#else
+#else // !wxX11

 
     // before scrolling it, ensure that we don't have any unpainted areas
     Update();
 
     // before scrolling it, ensure that we don't have any unpainted areas
     Update();


@@ -932,11 +934,11 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
         r = ScrollNoRefresh(0, dy, rect);
         Refresh(TRUE /* erase bkgnd */, &r);
     }
         r = ScrollNoRefresh(0, dy, rect);
         Refresh(TRUE /* erase bkgnd */, &r);
     }

-    
-    // scroll children accordingly:    
+
+    // scroll children accordingly:

     wxPoint offset(dx, dy);
     wxPoint offset(dx, dy);

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

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


@@ -944,13 +946,13 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
             continue;
 
         // VS: Scrolling children has non-trivial semantics. If rect=NULL then
             continue;
 
         // VS: Scrolling children has non-trivial semantics. If rect=NULL then

-        //     it is easy: we scroll all children. Otherwise it gets 
+        //     it is easy: we scroll all children. Otherwise it gets

         //     complicated:
         //       1. if scrolling in one direction only, scroll only
         //          those children that intersect shaft defined by the rectangle
         //          and scrolling direction
         //       2. if scrolling in both axes, scroll all children
         //     complicated:
         //       1. if scrolling in one direction only, scroll only
         //          those children that intersect shaft defined by the rectangle
         //          and scrolling direction
         //       2. if scrolling in both axes, scroll all children

-        
+

         if ( rect && (dx * dy == 0 /* moving in only one of x, y axis */) )
         {
             wxRect childRect = child->GetRect();
         if ( rect && (dx * dy == 0 /* moving in only one of x, y axis */) )
         {
             wxRect childRect = child->GetRect();


@@ -969,8 +971,8 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
         {
             child->Move(child->GetPosition() + offset);
         }
         {
             child->Move(child->GetPosition() + offset);
         }

-    }    
-#endif
+    }
+#endif // wxX11/!wxX11

 }
 
 wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
 }
 
 wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)