[ 1579793 ] numerous bug fixes when mask is used

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

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index afc1a6efbd6132fdee5590eddb5be3df87b881d1..b1147291741290a84d9bd63baed89c1995c4ce25 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        univ/window.cpp
+// Name:        src/univ/window.cpp

 // Purpose:     implementation of extra wxWindow methods for wxUniv port
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Purpose:     implementation of extra wxWindow methods for wxUniv port
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "univwindow.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,18 +24,19 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/window.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/window.h"

     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
     #include "wx/event.h"
     #include "wx/scrolbar.h"
     #include "wx/menu.h"
     #include "wx/frame.h"
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
     #include "wx/event.h"
     #include "wx/scrolbar.h"
     #include "wx/menu.h"
     #include "wx/frame.h"

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #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"


@@ -74,6 +71,8 @@
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK)
 #elif defined(__WXMGL__)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMGL)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK)
 #elif defined(__WXMGL__)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMGL)

+#elif defined(__WXDFB__)
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowDFB)

 #elif defined(__WXX11__)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowX11)
 #elif defined(__WXPM__)
 #elif defined(__WXX11__)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowX11)
 #elif defined(__WXPM__)


@@ -103,15 +102,17 @@ END_EVENT_TABLE()
 
 void wxWindow::Init()
 {
 
 void wxWindow::Init()
 {

+#if wxUSE_SCROLLBAR

     m_scrollbarVert =
     m_scrollbarHorz = (wxScrollBar *)NULL;
     m_scrollbarVert =
     m_scrollbarHorz = (wxScrollBar *)NULL;

+#endif // wxUSE_SCROLLBAR

 
 

-    m_isCurrent = FALSE;
+    m_isCurrent = false;

 
     m_renderer = wxTheme::Get()->GetRenderer();
 
 
     m_renderer = wxTheme::Get()->GetRenderer();
 

-    m_oldSize.x = -1;
-    m_oldSize.y = -1;
+    m_oldSize.x = wxDefaultCoord;
+    m_oldSize.y = wxDefaultCoord;

 }
 
 bool wxWindow::Create(wxWindow *parent,
 }
 
 bool wxWindow::Create(wxWindow *parent,


@@ -121,33 +122,80 @@ bool wxWindow::Create(wxWindow *parent,
                       long style,
                       const wxString& name)
 {
                       long style,
                       const wxString& name)
 {

+    long actualStyle = style;
+
+    // FIXME: may need this on other platforms
+#ifdef __WXMSW__
+    actualStyle &= ~wxVSCROLL;
+    actualStyle &= ~wxHSCROLL;
+#endif
+

     // we add wxCLIP_CHILDREN to get the same ("natural") behaviour under MSW
     // as under the other platforms
     if ( !wxWindowNative::Create(parent, id, pos, size,
     // we add wxCLIP_CHILDREN to get the same ("natural") behaviour under MSW
     // as under the other platforms
     if ( !wxWindowNative::Create(parent, id, pos, size,

-                                 style | wxCLIP_CHILDREN,
+                                 actualStyle | wxCLIP_CHILDREN,

                                  name) )
     {
                                  name) )
     {

-        return FALSE;
+        return false;

     }
 
     }
 

-    // if we should always have the scrollbar, do show it
-    if ( GetWindowStyle() & wxALWAYS_SHOW_SB )
+    // Set full style again, including those we didn't want present
+    // when calling the base window Create().
+    wxWindowBase::SetWindowStyleFlag(style);
+
+    // if we allow or should always have a vertical scrollbar, make it
+    if ( style & wxVSCROLL || style & wxALWAYS_SHOW_SB )

     {
 #if wxUSE_TWO_WINDOWS
     {
 #if wxUSE_TWO_WINDOWS

-        SetInsertIntoMain( TRUE );
+        SetInsertIntoMain( true );

 #endif
 #endif

-        m_scrollbarVert = new wxScrollBar(this, -1,
+#if wxUSE_SCROLLBAR
+        m_scrollbarVert = new wxScrollBar(this, wxID_ANY,

                                           wxDefaultPosition, wxDefaultSize,
                                           wxSB_VERTICAL);
                                           wxDefaultPosition, wxDefaultSize,
                                           wxSB_VERTICAL);

+#endif // wxUSE_SCROLLBAR
+#if wxUSE_TWO_WINDOWS
+        SetInsertIntoMain( false );
+#endif
+    }
+
+    // if we should allow a horizontal scrollbar, make it
+    if ( style & wxHSCROLL )
+    {
+#if wxUSE_TWO_WINDOWS
+        SetInsertIntoMain( true );
+#endif
+#if wxUSE_SCROLLBAR
+        m_scrollbarHorz = new wxScrollBar(this, wxID_ANY,
+                                          wxDefaultPosition, wxDefaultSize,
+                                          wxSB_HORIZONTAL);
+#endif // wxUSE_SCROLLBAR

 #if wxUSE_TWO_WINDOWS
 #if wxUSE_TWO_WINDOWS

-        SetInsertIntoMain( FALSE );
+        SetInsertIntoMain( false );

 #endif
 #endif

+    }

 
 

-        // and position it
+#if wxUSE_SCROLLBAR
+    if (m_scrollbarHorz || m_scrollbarVert)
+    {
+        // position it/them

         PositionScrollbars();
     }
         PositionScrollbars();
     }

+#endif // wxUSE_SCROLLBAR

 
 

-    return TRUE;
+    return true;
+}
+
+wxWindow::~wxWindow()
+{
+    m_isBeingDeleted = true;
+
+    // we have to destroy our children before we're destroyed because our
+    // children suppose that we're of type wxWindow, not just wxWindowNative,
+    // and so bad things may happen if they're deleted from the base class dtor
+    // as by then we're not a wxWindow any longer and wxUniv-specific virtual
+    // functions can't be called
+    DestroyChildren();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -182,18 +230,14 @@ 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(wxNcPaintEvent& WXUNUSED(event))

 {
     if ( m_renderer )
     {
         // get the window rect
 {
     if ( m_renderer )
     {
         // get the window rect

-        wxRect rect;
-        wxSize size = GetSize();
-        rect.x =
-        rect.y = 0;
-        rect.width = size.x;
-        rect.height = size.y;
+        wxRect rect(GetSize());

 
 

+#if wxUSE_SCROLLBAR

         // if the scrollbars are outside the border, we must adjust the rect to
         // exclude them
         if ( !m_renderer->AreScrollbarsInsideBorder() )
         // if the scrollbars are outside the border, we must adjust the rect to
         // exclude them
         if ( !m_renderer->AreScrollbarsInsideBorder() )


@@ -206,6 +250,7 @@ void wxWindow::OnNcPaint(wxPaintEvent& event)
             if ( scrollbar )
                 rect.height -= scrollbar->GetSize().y;
         }
             if ( scrollbar )
                 rect.height -= scrollbar->GetSize().y;
         }

+#endif // wxUSE_SCROLLBAR

 
         // get the DC and draw the border on it
         wxWindowDC dc(this);
 
         // get the DC and draw the border on it
         wxWindowDC dc(this);


@@ -243,6 +288,7 @@ void wxWindow::OnErase(wxEraseEvent& event)
 
     DoDrawBackground(*event.GetDC());
 
 
     DoDrawBackground(*event.GetDC());
 

+#if wxUSE_SCROLLBAR

     // if we have both scrollbars, we also have a square in the corner between
     // them which we must paint
     if ( m_scrollbarVert && m_scrollbarHorz )
     // if we have both scrollbars, we also have a square in the corner between
     // them which we must paint
     if ( m_scrollbarVert && m_scrollbarHorz )


@@ -262,6 +308,7 @@ void wxWindow::OnErase(wxEraseEvent& event)
             m_renderer->DrawScrollCorner(*event.GetDC(), rectCorner);
         }
     }
             m_renderer->DrawScrollCorner(*event.GetDC(), rectCorner);
         }
     }

+#endif // wxUSE_SCROLLBAR

 }
 
 bool wxWindow::DoDrawBackground(wxDC& dc)
 }
 
 bool wxWindow::DoDrawBackground(wxDC& dc)


@@ -275,7 +322,7 @@ bool wxWindow::DoDrawBackground(wxDC& dc)
     rect.height = size.y;
 
     wxWindow * const parent = GetParent();
     rect.height = size.y;
 
     wxWindow * const parent = GetParent();

-    if ( HasTransparentBackground() && parent && parent->ProvidesBackground() )
+    if ( HasTransparentBackground() && parent )

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


@@ -284,10 +331,10 @@ bool wxWindow::DoDrawBackground(wxDC& dc)
         AdjustForParentClientOrigin( pos.x, pos.y, 0 );
 
         // Adjust DC logical origin
         AdjustForParentClientOrigin( pos.x, pos.y, 0 );
 
         // Adjust DC logical origin

-        wxCoord x,y;
-        dc.GetLogicalOrigin( &x, &y );
-        x += pos.x;
-        y += pos.y;
+        wxCoord org_x, org_y, x, y;
+        dc.GetLogicalOrigin( &org_x, &org_y );
+        x = org_x + pos.x;
+        y = org_y + pos.y;

         dc.SetLogicalOrigin( x, y );
 
         // Adjust draw rect
         dc.SetLogicalOrigin( x, y );
 
         // Adjust draw rect


@@ -296,14 +343,17 @@ bool wxWindow::DoDrawBackground(wxDC& dc)
 
         // Let parent draw the background
         parent->EraseBackground( dc, rect );
 
         // Let parent draw the background
         parent->EraseBackground( dc, rect );

+
+        // Restore DC logical origin
+        dc.SetLogicalOrigin( org_x, org_y );

     }
     else
     {
     }
     else
     {

-        // Draw background ouselves
+        // Draw background ourselves

         EraseBackground( dc, rect );
     }
 
         EraseBackground( dc, rect );
     }
 

-    return TRUE;
+    return true;

 }
 
 void wxWindow::EraseBackground(wxDC& dc, const wxRect& rect)
 }
 
 void wxWindow::EraseBackground(wxDC& dc, const wxRect& rect)


@@ -337,41 +387,43 @@ void wxWindow::DoDrawBorder(wxDC& dc, const wxRect& rect)
     }
 }
 
     }
 }
 

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

 {
 }
 
 {
 }
 

-void wxWindow::Refresh(bool eraseBackground, const wxRect *rectClient)
+void wxWindow::Refresh(bool eraseBackground, const wxRect *rect)

 {
 {

-    wxRect rectWin;
-    wxPoint pt = GetClientAreaOrigin();
+    wxRect rectClient; // the same rectangle in client coordinates
+    wxPoint origin = GetClientAreaOrigin();

 
     wxSize size = GetClientSize();
 
 
     wxSize size = GetClientSize();
 

-    if ( rectClient )
+    if ( rect )

     {
     {

-        rectWin = *rectClient;
+        // the rectangle passed as argument is in client coordinates
+        rectClient = *rect;

 
         // don't refresh anything beyond the client area (scrollbars for
         // example)
 
         // don't refresh anything beyond the client area (scrollbars for
         // example)

-        if ( rectWin.GetRight() > size.x )
-            rectWin.SetRight(size.x);
-        if ( rectWin.GetBottom() > size.y )
-            rectWin.SetBottom(size.y);
+        if ( rectClient.GetRight() > size.x )
+            rectClient.SetRight(size.x);
+        if ( rectClient.GetBottom() > size.y )
+            rectClient.SetBottom(size.y);

 
 

-        rectWin.Offset(pt);

     }
     else // refresh the entire client area
     {
     }
     else // refresh the entire client area
     {

-        rectWin.x = pt.x;
-        rectWin.y = pt.y;
-        rectWin.width = size.x;
-        rectWin.height = size.y;
+        // x,y is already set to 0 by default
+        rectClient.SetSize(size);

     }
 
     }
 

+    // convert refresh rectangle to window coordinates:
+    wxRect rectWin(rectClient);
+    rectWin.Offset(origin);
+

     // debugging helper
 #ifdef WXDEBUG_REFRESH
     // debugging helper
 #ifdef WXDEBUG_REFRESH

-    static bool s_refreshDebug = FALSE;
+    static bool s_refreshDebug = false;

     if ( s_refreshDebug )
     {
         wxWindowDC dc(this);
     if ( s_refreshDebug )
     {
         wxWindowDC dc(this);


@@ -388,6 +440,33 @@ void wxWindow::Refresh(bool eraseBackground, const wxRect *rectClient)
 #endif // WXDEBUG_REFRESH
 
     wxWindowNative::Refresh(eraseBackground, &rectWin);
 #endif // WXDEBUG_REFRESH
 
     wxWindowNative::Refresh(eraseBackground, &rectWin);

+
+    // Refresh all sub controls if any.
+    wxWindowList& children = GetChildren();
+    for ( wxWindowList::iterator i = children.begin(); i != children.end(); ++i )
+    {
+        wxWindow *child = *i;
+        // only refresh subcontrols if they are visible:
+        if ( child->IsTopLevel() || !child->IsShown() || child->IsFrozen() )
+            continue;
+
+        // ...and when the subcontrols are in the update region:
+        wxRect childrect(child->GetRect());
+        childrect.Intersect(rectClient);
+        if ( childrect.IsEmpty() )
+            continue;
+
+        // refresh the subcontrol now:
+        childrect.Offset(-child->GetPosition());
+        // NB: We must call wxWindowNative version because we need to refresh
+        //     the entire control, not just its client area, and this is why we
+        //     don't account for child client area origin here neither. Also
+        //     note that we don't pass eraseBackground to the child, but use
+        //     true instead: this is because we can't be sure that
+        //     eraseBackground=false is safe for children as well and not only
+        //     for the parent.
+        child->wxWindowNative::Refresh(eraseBackground, &childrect);
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -397,7 +476,7 @@ void wxWindow::Refresh(bool eraseBackground, const wxRect *rectClient)
 bool wxWindow::Enable(bool enable)
 {
     if ( !wxWindowNative::Enable(enable) )
 bool wxWindow::Enable(bool enable)
 {
     if ( !wxWindowNative::Enable(enable) )

-        return FALSE;
+        return false;

 
     // disabled window can't keep focus
     if ( FindFocus() == this && GetParent() != NULL )
 
     // disabled window can't keep focus
     if ( FindFocus() == this && GetParent() != NULL )


@@ -412,23 +491,22 @@ bool wxWindow::Enable(bool enable)
         Refresh();
     }
 
         Refresh();
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxWindow::IsFocused() const
 {
 }
 
 bool wxWindow::IsFocused() const
 {

-    wxWindow *self = wxConstCast(this, wxWindow);
-    return self->FindFocus() == self;
+    return FindFocus() == this;

 }
 
 bool wxWindow::IsPressed() const
 {
 }
 
 bool wxWindow::IsPressed() const
 {

-    return FALSE;
+    return false;

 }
 
 bool wxWindow::IsDefault() const
 {
 }
 
 bool wxWindow::IsDefault() const
 {

-    return FALSE;
+    return false;

 }
 
 bool wxWindow::IsCurrent() const
 }
 
 bool wxWindow::IsCurrent() const


@@ -439,14 +517,14 @@ bool wxWindow::IsCurrent() const
 bool wxWindow::SetCurrent(bool doit)
 {
     if ( doit == m_isCurrent )
 bool wxWindow::SetCurrent(bool doit)
 {
     if ( doit == m_isCurrent )

-        return FALSE;
+        return false;

 
     m_isCurrent = doit;
 
     if ( CanBeHighlighted() )
         Refresh();
 
 
     m_isCurrent = doit;
 
     if ( CanBeHighlighted() )
         Refresh();
 

-    return TRUE;
+    return true;

 }
 
 int wxWindow::GetStateFlags() const
 }
 
 int wxWindow::GetStateFlags() const


@@ -480,22 +558,24 @@ void wxWindow::OnSize(wxSizeEvent& event)
 {
     event.Skip();
 
 {
     event.Skip();
 

+#if wxUSE_SCROLLBAR

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

+#endif // wxUSE_SCROLLBAR

 
 #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())
+    if ( !HasFlag(wxFULL_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();
 
     {
         // 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)
+        if (m_oldSize.x == wxDefaultCoord && m_oldSize.y == wxDefaultCoord)

         {
             m_oldSize = newSize;
             return;
         {
             m_oldSize = newSize;
             return;


@@ -510,7 +590,7 @@ void wxWindow::OnSize(wxSizeEvent& event)
                 rect.width = m_oldSize.x;
                 rect.y = m_oldSize.y-2;
                 rect.height = 1;
                 rect.width = m_oldSize.x;
                 rect.y = m_oldSize.y-2;
                 rect.height = 1;

-                Refresh( TRUE, &rect );
+                Refresh( true, &rect );

             }
             else if (newSize.y < m_oldSize.y)
             {
             }
             else if (newSize.y < m_oldSize.y)
             {


@@ -519,7 +599,7 @@ void wxWindow::OnSize(wxSizeEvent& event)
                 rect.x = 0;
                 rect.height = 1;
                 rect.width = newSize.x;
                 rect.x = 0;
                 rect.height = 1;
                 rect.width = newSize.x;

-                wxWindowNative::Refresh( TRUE, &rect );
+                wxWindowNative::Refresh( true, &rect );

             }
 
             if (newSize.x > m_oldSize.x)
             }
 
             if (newSize.x > m_oldSize.x)


@@ -529,7 +609,7 @@ void wxWindow::OnSize(wxSizeEvent& event)
                 rect.height = m_oldSize.y;
                 rect.x = m_oldSize.x-2;
                 rect.width = 1;
                 rect.height = m_oldSize.y;
                 rect.x = m_oldSize.x-2;
                 rect.width = 1;

-                Refresh( TRUE, &rect );
+                Refresh( true, &rect );

             }
             else if (newSize.x < m_oldSize.x)
             {
             }
             else if (newSize.x < m_oldSize.x)
             {


@@ -538,7 +618,7 @@ void wxWindow::OnSize(wxSizeEvent& event)
                 rect.y = 0;
                 rect.width = 1;
                 rect.height = newSize.y;
                 rect.y = 0;
                 rect.width = 1;
                 rect.height = newSize.y;

-                wxWindowNative::Refresh( TRUE, &rect );
+                wxWindowNative::Refresh( true, &rect );

             }
         }
         else
             }
         }
         else


@@ -551,7 +631,7 @@ void wxWindow::OnSize(wxSizeEvent& event)
                 rect.width = m_oldSize.x;
                 rect.y = m_oldSize.y-4;
                 rect.height = 2;
                 rect.width = m_oldSize.x;
                 rect.y = m_oldSize.y-4;
                 rect.height = 2;

-                Refresh( TRUE, &rect );
+                Refresh( true, &rect );

             }
             else if (newSize.y < m_oldSize.y)
             {
             }
             else if (newSize.y < m_oldSize.y)
             {


@@ -560,7 +640,7 @@ void wxWindow::OnSize(wxSizeEvent& event)
                 rect.x = 0;
                 rect.height = 2;
                 rect.width = newSize.x;
                 rect.x = 0;
                 rect.height = 2;
                 rect.width = newSize.x;

-                wxWindowNative::Refresh( TRUE, &rect );
+                wxWindowNative::Refresh( true, &rect );

             }
 
             if (newSize.x > m_oldSize.x)
             }
 
             if (newSize.x > m_oldSize.x)


@@ -570,7 +650,7 @@ void wxWindow::OnSize(wxSizeEvent& event)
                 rect.height = m_oldSize.y;
                 rect.x = m_oldSize.x-4;
                 rect.width = 2;
                 rect.height = m_oldSize.y;
                 rect.x = m_oldSize.x-4;
                 rect.width = 2;

-                Refresh( TRUE, &rect );
+                Refresh( true, &rect );

             }
             else if (newSize.x < m_oldSize.x)
             {
             }
             else if (newSize.x < m_oldSize.x)
             {


@@ -579,7 +659,7 @@ void wxWindow::OnSize(wxSizeEvent& event)
                 rect.y = 0;
                 rect.width = 2;
                 rect.height = newSize.y;
                 rect.y = 0;
                 rect.width = 2;
                 rect.height = newSize.y;

-                wxWindowNative::Refresh( TRUE, &rect );
+                wxWindowNative::Refresh( true, &rect );

             }
         }
 
             }
         }
 


@@ -640,21 +720,16 @@ void wxWindow::DoGetClientSize(int *width, int *height) const
     if ( m_renderer )
         rectBorder = m_renderer->GetBorderDimensions(GetBorder());
 
     if ( m_renderer )
         rectBorder = m_renderer->GetBorderDimensions(GetBorder());
 

-    bool inside = m_renderer->AreScrollbarsInsideBorder();
-

     if ( width )
     {
     if ( width )
     {

+#if wxUSE_SCROLLBAR

         // in any case, take account of the scrollbar
         if ( m_scrollbarVert )
             w -= m_scrollbarVert->GetSize().x;
         // in any case, take account of the scrollbar
         if ( m_scrollbarVert )
             w -= m_scrollbarVert->GetSize().x;

+#endif // wxUSE_SCROLLBAR

 
 

-        // if we don't have scrollbar or if it is outside the border (and not
-        // blended into it), take account of the right border as well
-        if ( !m_scrollbarVert || inside )
-            w -= rectBorder.width;
-
-        // and always account for the left border
-        *width = w - rectBorder.x;
+        // account for the left and right borders
+        *width = w - rectBorder.x - rectBorder.width;

 
         // we shouldn't return invalid width
         if ( *width < 0 )
 
         // we shouldn't return invalid width
         if ( *width < 0 )


@@ -663,13 +738,12 @@ void wxWindow::DoGetClientSize(int *width, int *height) const
 
     if ( height )
     {
 
     if ( height )
     {

+#if wxUSE_SCROLLBAR

         if ( m_scrollbarHorz )
             h -= m_scrollbarHorz->GetSize().y;
         if ( m_scrollbarHorz )
             h -= m_scrollbarHorz->GetSize().y;

+#endif // wxUSE_SCROLLBAR

 
 

-        if ( !m_scrollbarHorz || inside )
-            h -= rectBorder.height;
-
-        *height = h - rectBorder.y;
+        *height = h - rectBorder.y - rectBorder.height;

 
         // we shouldn't return invalid height
         if ( *height < 0 )
 
         // we shouldn't return invalid height
         if ( *height < 0 )


@@ -687,17 +761,18 @@ void wxWindow::DoSetClientSize(int width, int height)
     // and the scrollbars (as they may be offset into the border, use the
     // scrollbar position, not size - this supposes that PositionScrollbars()
     // had been called before)
     // and the scrollbars (as they may be offset into the border, use the
     // scrollbar position, not size - this supposes that PositionScrollbars()
     // had been called before)

-    bool inside = m_renderer->AreScrollbarsInsideBorder();

     wxSize size = GetSize();
     wxSize size = GetSize();

+#if wxUSE_SCROLLBAR

     if ( m_scrollbarVert )
         width += size.x - m_scrollbarVert->GetPosition().x;
     if ( m_scrollbarVert )
         width += size.x - m_scrollbarVert->GetPosition().x;

-    if ( !m_scrollbarVert || inside )
-        width += rectBorder.width;
+#endif // wxUSE_SCROLLBAR
+    width += rectBorder.width;

 
 

+#if wxUSE_SCROLLBAR

     if ( m_scrollbarHorz )
         height += size.y - m_scrollbarHorz->GetPosition().y;
     if ( m_scrollbarHorz )
         height += size.y - m_scrollbarHorz->GetPosition().y;

-    if ( !m_scrollbarHorz || inside )
-        height += rectBorder.height;
+#endif // wxUSE_SCROLLBAR
+    height += rectBorder.height;

 
     wxWindowNative::DoSetClientSize(width, height);
 }
 
     wxWindowNative::DoSetClientSize(width, height);
 }


@@ -705,6 +780,8 @@ void wxWindow::DoSetClientSize(int width, int height)
 wxHitTest wxWindow::DoHitTest(wxCoord x, wxCoord y) const
 {
     wxHitTest ht = wxWindowNative::DoHitTest(x, y);
 wxHitTest wxWindow::DoHitTest(wxCoord x, wxCoord y) const
 {
     wxHitTest ht = wxWindowNative::DoHitTest(x, y);

+
+#if wxUSE_SCROLLBAR

     if ( ht == wxHT_WINDOW_INSIDE )
     {
         if ( m_scrollbarVert && x >= m_scrollbarVert->GetPosition().x )
     if ( ht == wxHT_WINDOW_INSIDE )
     {
         if ( m_scrollbarVert && x >= m_scrollbarVert->GetPosition().x )


@@ -719,6 +796,7 @@ wxHitTest wxWindow::DoHitTest(wxCoord x, wxCoord y) const
                                                   : wxHT_WINDOW_HORZ_SCROLLBAR;
         }
     }
                                                   : wxHT_WINDOW_HORZ_SCROLLBAR;
         }
     }

+#endif // wxUSE_SCROLLBAR

 
     return ht;
 }
 
     return ht;
 }


@@ -731,15 +809,18 @@ wxHitTest wxWindow::DoHitTest(wxCoord x, wxCoord y) const
 
 void wxWindow::RefreshScrollbars()
 {
 
 void wxWindow::RefreshScrollbars()
 {

+#if wxUSE_SCROLLBAR

     if ( m_scrollbarHorz )
         m_scrollbarHorz->Refresh();
 
     if ( m_scrollbarVert )
         m_scrollbarVert->Refresh();
     if ( m_scrollbarHorz )
         m_scrollbarHorz->Refresh();
 
     if ( m_scrollbarVert )
         m_scrollbarVert->Refresh();

+#endif // wxUSE_SCROLLBAR

 }
 
 void wxWindow::PositionScrollbars()
 {
 }
 
 void wxWindow::PositionScrollbars()
 {

+#if wxUSE_SCROLLBAR

     // do not use GetClientSize/Rect as it relies on the scrollbars being
     // correctly positioned
 
     // do not use GetClientSize/Rect as it relies on the scrollbars being
     // correctly positioned
 


@@ -785,6 +866,7 @@ void wxWindow::PositionScrollbars()
     }
 
     RefreshScrollbars();
     }
 
     RefreshScrollbars();

+#endif // wxUSE_SCROLLBAR

 }
 
 void wxWindow::SetScrollbar(int orient,
 }
 
 void wxWindow::SetScrollbar(int orient,


@@ -793,10 +875,11 @@ void wxWindow::SetScrollbar(int orient,
                             int range,
                             bool refresh)
 {
                             int range,
                             bool refresh)
 {

+#if wxUSE_SCROLLBAR

     wxASSERT_MSG( pageSize <= range,
                     _T("page size can't be greater than range") );
 
     wxASSERT_MSG( pageSize <= range,
                     _T("page size can't be greater than range") );
 

-    bool hasClientSizeChanged = FALSE;
+    bool hasClientSizeChanged = false;

     wxScrollBar *scrollbar = GetScrollbar(orient);
     if ( range && (pageSize < range) )
     {
     wxScrollBar *scrollbar = GetScrollbar(orient);
     if ( range && (pageSize < range) )
     {


@@ -804,14 +887,14 @@ void wxWindow::SetScrollbar(int orient,
         {
             // create it
 #if wxUSE_TWO_WINDOWS
         {
             // create it
 #if wxUSE_TWO_WINDOWS

-            SetInsertIntoMain( TRUE );
+            SetInsertIntoMain( true );

 #endif
 #endif

-            scrollbar = new wxScrollBar(this, -1,
+            scrollbar = new wxScrollBar(this, wxID_ANY,

                                         wxDefaultPosition, wxDefaultSize,
                                         orient & wxVERTICAL ? wxSB_VERTICAL
                                                             : wxSB_HORIZONTAL);
 #if wxUSE_TWO_WINDOWS
                                         wxDefaultPosition, wxDefaultSize,
                                         orient & wxVERTICAL ? wxSB_VERTICAL
                                                             : wxSB_HORIZONTAL);
 #if wxUSE_TWO_WINDOWS

-            SetInsertIntoMain( FALSE );
+            SetInsertIntoMain( false );

 #endif
             if ( orient & wxVERTICAL )
                 m_scrollbarVert = scrollbar;
 #endif
             if ( orient & wxVERTICAL )
                 m_scrollbarVert = scrollbar;


@@ -819,7 +902,7 @@ void wxWindow::SetScrollbar(int orient,
                 m_scrollbarHorz = scrollbar;
 
             // the client area diminished as we created a scrollbar
                 m_scrollbarHorz = scrollbar;
 
             // the client area diminished as we created a scrollbar

-            hasClientSizeChanged = TRUE;
+            hasClientSizeChanged = true;

 
             PositionScrollbars();
         }
 
             PositionScrollbars();
         }


@@ -852,7 +935,7 @@ void wxWindow::SetScrollbar(int orient,
                     m_scrollbarHorz = NULL;
 
                 // the client area increased as we removed a scrollbar
                     m_scrollbarHorz = NULL;
 
                 // the client area increased as we removed a scrollbar

-                hasClientSizeChanged = TRUE;
+                hasClientSizeChanged = true;

 
                 // the size of the remaining scrollbar must be adjusted
                 if ( m_scrollbarHorz || m_scrollbarVert )
 
                 // the size of the remaining scrollbar must be adjusted
                 if ( m_scrollbarHorz || m_scrollbarVert )


@@ -873,14 +956,22 @@ void wxWindow::SetScrollbar(int orient,
         (void)GetEventHandler()->ProcessEvent(event);
 #endif
     }
         (void)GetEventHandler()->ProcessEvent(event);
 #endif
     }

+#else
+    wxUnusedVar(orient);
+    wxUnusedVar(pos);
+    wxUnusedVar(pageSize);
+    wxUnusedVar(range);
+    wxUnusedVar(refresh);
+#endif // wxUSE_SCROLLBAR

 }
 
 }
 

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

 {
 {

+#if wxUSE_SCROLLBAR

     wxScrollBar *scrollbar = GetScrollbar(orient);
     wxScrollBar *scrollbar = GetScrollbar(orient);

-    wxCHECK_RET( scrollbar, _T("no scrollbar to set position for") );

 
 

-    scrollbar->SetThumbPosition(pos);
+    if (scrollbar)
+        scrollbar->SetThumbPosition(pos);

 
     // VZ: I think we can safely ignore this as we always refresh it
     //     automatically whenever the value chanegs
 
     // VZ: I think we can safely ignore this as we always refresh it
     //     automatically whenever the value chanegs


@@ -888,24 +979,43 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
     if ( refresh )
         Refresh();
 #endif
     if ( refresh )
         Refresh();
 #endif

+#else
+    wxUnusedVar(orient);
+    wxUnusedVar(pos);
+#endif // wxUSE_SCROLLBAR

 }
 
 int wxWindow::GetScrollPos(int orient) const
 {
 }
 
 int wxWindow::GetScrollPos(int orient) const
 {

+#if wxUSE_SCROLLBAR

     wxScrollBar *scrollbar = GetScrollbar(orient);
     return scrollbar ? scrollbar->GetThumbPosition() : 0;
     wxScrollBar *scrollbar = GetScrollbar(orient);
     return scrollbar ? scrollbar->GetThumbPosition() : 0;

+#else
+    wxUnusedVar(orient);
+    return 0;
+#endif // wxUSE_SCROLLBAR

 }
 
 int wxWindow::GetScrollThumb(int orient) const
 {
 }
 
 int wxWindow::GetScrollThumb(int orient) const
 {

+#if wxUSE_SCROLLBAR

     wxScrollBar *scrollbar = GetScrollbar(orient);
     return scrollbar ? scrollbar->GetThumbSize() : 0;
     wxScrollBar *scrollbar = GetScrollbar(orient);
     return scrollbar ? scrollbar->GetThumbSize() : 0;

+#else
+    wxUnusedVar(orient);
+    return 0;
+#endif // wxUSE_SCROLLBAR

 }
 
 int wxWindow::GetScrollRange(int orient) const
 {
 }
 
 int wxWindow::GetScrollRange(int orient) const
 {

+#if wxUSE_SCROLLBAR

     wxScrollBar *scrollbar = GetScrollbar(orient);
     return scrollbar ? scrollbar->GetRange() : 0;
     wxScrollBar *scrollbar = GetScrollbar(orient);
     return scrollbar ? scrollbar->GetRange() : 0;

+#else
+    wxUnusedVar(orient);
+    return 0;
+#endif // wxUSE_SCROLLBAR

 }
 
 void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 }
 
 void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)


@@ -926,24 +1036,26 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
     if ( dx )
     {
         r = ScrollNoRefresh(dx, 0, rect);
     if ( dx )
     {
         r = ScrollNoRefresh(dx, 0, rect);

-        Refresh(TRUE /* erase bkgnd */, &r);
+        Refresh(true /* erase bkgnd */, &r);

     }
 
     if ( dy )
     {
         r = ScrollNoRefresh(0, dy, rect);
     }
 
     if ( dy )
     {
         r = ScrollNoRefresh(0, dy, rect);

-        Refresh(TRUE /* erase bkgnd */, &r);
+        Refresh(true /* erase bkgnd */, &r);

     }
 
     // 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();

+#if wxUSE_SCROLLBAR

         if ( child == m_scrollbarVert || child == m_scrollbarHorz )
             continue;
         if ( child == m_scrollbarVert || child == m_scrollbarHorz )
             continue;

+#endif // wxUSE_SCROLLBAR

 
         // VS: Scrolling children has non-trivial semantics. If rect=NULL then
         //     it is easy: we scroll all children. Otherwise it gets
 
         // VS: Scrolling children has non-trivial semantics. If rect=NULL then
         //     it is easy: we scroll all children. Otherwise it gets


@@ -1055,12 +1167,12 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
         wxMemoryDC dcMem;
         dcMem.SelectObject(bmp);
 
         wxMemoryDC dcMem;
         dcMem.SelectObject(bmp);
 

-        dcMem.Blit(wxPoint(0, 0), size, &dc, ptSource
+        dcMem.Blit(wxPoint(0,0), size, &dc, ptSource

 #if defined(__WXGTK__) && !defined(wxHAS_WORKING_GTK_DC_BLIT)
                 + GetClientAreaOrigin()
 #endif // broken wxGTK wxDC::Blit
                   );
 #if defined(__WXGTK__) && !defined(wxHAS_WORKING_GTK_DC_BLIT)
                 + GetClientAreaOrigin()
 #endif // broken wxGTK wxDC::Blit
                   );

-        dc.Blit(ptDest, size, &dcMem, wxPoint(0, 0));
+        dc.Blit(ptDest, size, &dcMem, wxPoint(0,0));

 
         wxLogTrace(_T("scroll"),
                    _T("Blit: (%d, %d) of size %dx%d -> (%d, %d)"),
 
         wxLogTrace(_T("scroll"),
                    _T("Blit: (%d, %d) of size %dx%d -> (%d, %d)"),


@@ -1144,7 +1256,7 @@ void wxWindow::OnKeyDown(wxKeyEvent& event)
 {
 #if wxUSE_MENUS
     int key = event.GetKeyCode();
 {
 #if wxUSE_MENUS
     int key = event.GetKeyCode();

-    if ( !event.ControlDown() && (key == WXK_MENU || key == WXK_F10) )
+    if ( !event.ControlDown() && (key == WXK_ALT || key == WXK_F10) )

     {
         ms_winLastAltPress = this;
 
     {
         ms_winLastAltPress = this;
 


@@ -1261,7 +1373,7 @@ void wxWindow::OnChar(wxKeyEvent& event)
 void wxWindow::OnKeyUp(wxKeyEvent& event)
 {
     int key = event.GetKeyCode();
 void wxWindow::OnKeyUp(wxKeyEvent& event)
 {
     int key = event.GetKeyCode();

-    if ( !event.HasModifiers() && (key == WXK_MENU || key == WXK_F10) )
+    if ( !event.HasModifiers() && (key == WXK_ALT || key == WXK_F10) )

     {
         // only process Alt release specially if there were no other key
         // presses since Alt had been pressed and if both events happened in
     {
         // only process Alt release specially if there were no other key
         // presses since Alt had been pressed and if both events happened in


@@ -1294,7 +1406,7 @@ void wxWindow::OnKeyUp(wxKeyEvent& event)
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

-long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
     if ( message == WM_NCHITTEST )
     {
 {
     if ( message == WM_NCHITTEST )
     {


@@ -1311,4 +1423,3 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 }
 
 #endif // __WXMSW__
 }
 
 #endif // __WXMSW__

-