generate middle click events (patch 1521314)

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

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index be8a2ba4e3a23759b05a3eb0ac38d1b886558de7..a62dbdc55fe9164cadbf405388ae0849d271323c 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,15 +24,17 @@
     #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
 
 #include "wx/univ/colschem.h"
 #endif // WX_PRECOMP
 
 #include "wx/univ/colschem.h"


@@ -102,15 +100,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,


@@ -120,33 +120,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
 #if wxUSE_TWO_WINDOWS

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

 #endif
 #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
+        SetInsertIntoMain( false );
+#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();

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


@@ -180,52 +227,15 @@ const wxBitmap& wxWindow::GetBackgroundBitmap(int *alignment,
 // painting
 // ----------------------------------------------------------------------------
 
 // painting
 // ----------------------------------------------------------------------------
 

-// the event handler executed when the window background must be painted
-void wxWindow::OnErase(wxEraseEvent& event)
-{
-    if ( !m_renderer )
-    {
-        event.Skip();
-
-        return;
-    }
-    
-    DoDrawBackground(*event.GetDC());
-
-    // if we have both scrollbars, we also have a square in the corner between
-    // them which we must paint
-    if ( m_scrollbarVert && m_scrollbarHorz )
-    {
-        wxSize size = GetSize();
-        wxRect rectClient = GetClientRect(),
-               rectBorder = m_renderer->GetBorderDimensions(GetBorder());
-
-        wxRect rectCorner;
-        rectCorner.x = rectClient.GetRight() + 1;
-        rectCorner.y = rectClient.GetBottom() + 1;
-        rectCorner.SetRight(size.x - rectBorder.width);
-        rectCorner.SetBottom(size.y - rectBorder.height);
-
-        if ( GetUpdateRegion().Contains(rectCorner) )
-        {
-            m_renderer->DrawScrollCorner(*event.GetDC(), rectCorner);
-        }
-    }
-}
-

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


@@ -238,6 +248,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);


@@ -263,43 +274,103 @@ void wxWindow::OnPaint(wxPaintEvent& event)
     }
 }
 
     }
 }
 

+// the event handler executed when the window background must be painted
+void wxWindow::OnErase(wxEraseEvent& event)
+{
+    if ( !m_renderer )
+    {
+        event.Skip();
+
+        return;
+    }
+
+    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 )
+    {
+        wxSize size = GetSize();
+        wxRect rectClient = GetClientRect(),
+               rectBorder = m_renderer->GetBorderDimensions(GetBorder());
+
+        wxRect rectCorner;
+        rectCorner.x = rectClient.GetRight() + 1;
+        rectCorner.y = rectClient.GetBottom() + 1;
+        rectCorner.SetRight(size.x - rectBorder.width);
+        rectCorner.SetBottom(size.y - rectBorder.height);
+
+        if ( GetUpdateRegion().Contains(rectCorner) )
+        {
+            m_renderer->DrawScrollCorner(*event.GetDC(), rectCorner);
+        }
+    }
+#endif // wxUSE_SCROLLBAR
+}
+

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

-    // FIXME: leaving this code in leads to partial bg redraws sometimes under
-    //        MSW

     wxRect rect;
     wxRect rect;

-#ifndef __WXMSW__
-    rect = GetUpdateRegion().GetBox();
-    if ( !rect.width && !rect.height )
-#endif
+
+    wxSize size = GetSize();  // Why not GetClientSize() ?
+    rect.x = 0;
+    rect.y = 0;
+    rect.width = size.x;
+    rect.height = size.y;
+
+    wxWindow * const parent = GetParent();
+    if ( HasTransparentBackground() && parent )

     {
     {

-        wxSize size = GetSize();
-        rect.width = size.x;
-        rect.height = size.y;
+        wxASSERT( !IsTopLevel() );
+
+        wxPoint pos = GetPosition();
+
+        AdjustForParentClientOrigin( pos.x, pos.y, 0 );
+
+        // Adjust DC logical origin
+        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
+        rect.x = pos.x;
+        rect.y = pos.y;
+
+        // Let parent draw the background
+        parent->EraseBackground( dc, rect );
+
+        // Restore DC logical origin
+        dc.SetLogicalOrigin( org_x, org_y );

     }
     }

+    else
+    {
+        // Draw background ourselves
+        EraseBackground( dc, rect );
+    }
+
+    return true;
+}

 
 

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

     if ( GetBackgroundBitmap().Ok() )
     {
     if ( GetBackgroundBitmap().Ok() )
     {

-        // get the bitmap and the flags
+        // Get the bitmap and the flags

         int alignment;
         wxStretch stretch;
         wxBitmap bmp = GetBackgroundBitmap(&alignment, &stretch);
         wxControlRenderer::DrawBitmap(dc, bmp, rect, alignment, stretch);
     }
         int alignment;
         wxStretch stretch;
         wxBitmap bmp = GetBackgroundBitmap(&alignment, &stretch);
         wxControlRenderer::DrawBitmap(dc, bmp, rect, alignment, stretch);
     }

-    else // just fill it with bg colour if no bitmap
+    else

     {
     {

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

-
-    return TRUE;
-}
-
-void wxWindow::EraseBackground(wxDC& dc, const wxRect& rect)
-{
-    // TODO: handle bg bitmaps here!
-
-    m_renderer->DrawBackground(dc, wxTHEME_BG_COLOUR(this), rect, GetStateFlags());

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


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

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

 {
 }
 
 {
 }
 


@@ -348,7 +419,7 @@ void wxWindow::Refresh(bool eraseBackground, const wxRect *rectClient)
 
     // 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);


@@ -365,6 +436,19 @@ 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::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.
+        if(!win->IsKindOf(CLASSINFO(wxTopLevelWindow)) && win->IsShown() && wxRegion(rectWin).Contains(win->GetRect()) != wxOutRegion)
+            win->Refresh(eraseBackground, &rectWin);
+
+        node = node->GetNext();
+    }

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


@@ -374,7 +458,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 )


@@ -389,23 +473,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


@@ -416,14 +499,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


@@ -456,28 +539,30 @@ int wxWindow::GetStateFlags() const
 void wxWindow::OnSize(wxSizeEvent& event)
 {
     event.Skip();
 void wxWindow::OnSize(wxSizeEvent& event)
 {
     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;
         }

-        
+

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


@@ -487,7 +572,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)
             {


@@ -496,9 +581,9 @@ 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)
             {
                 wxRect rect;
             if (newSize.x > m_oldSize.x)
             {
                 wxRect rect;


@@ -506,7 +591,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)
             {


@@ -515,7 +600,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


@@ -528,7 +613,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)
             {


@@ -537,9 +622,9 @@ 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)
             {
                 wxRect rect;
             if (newSize.x > m_oldSize.x)
             {
                 wxRect rect;


@@ -547,7 +632,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)
             {


@@ -556,10 +641,10 @@ 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 );

             }
         }
             }
         }

-        
+

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


@@ -621,13 +706,19 @@ void wxWindow::DoGetClientSize(int *width, int *height) const
 
     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 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 )
+        if (
+#if wxUSE_SCROLLBAR
+             !m_scrollbarVert ||
+#endif // wxUSE_SCROLLBAR
+             inside )

             w -= rectBorder.width;
 
         // and always account for the left border
             w -= rectBorder.width;
 
         // and always account for the left border


@@ -640,10 +731,16 @@ 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 )
+        if (
+#if wxUSE_SCROLLBAR
+            !m_scrollbarHorz ||
+#endif // wxUSE_SCROLLBAR
+            inside )

             h -= rectBorder.height;
 
         *height = h - rectBorder.y;
             h -= rectBorder.height;
 
         *height = h - rectBorder.y;


@@ -666,14 +763,26 @@ void wxWindow::DoSetClientSize(int width, int height)
     // had been called before)
     bool inside = m_renderer->AreScrollbarsInsideBorder();
     wxSize size = GetSize();
     // had been called before)
     bool inside = m_renderer->AreScrollbarsInsideBorder();
     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 )
+#endif // wxUSE_SCROLLBAR
+    if (
+#if wxUSE_SCROLLBAR
+        !m_scrollbarVert ||
+#endif // wxUSE_SCROLLBAR
+        inside )

         width += rectBorder.width;
 
         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 )
+#endif // wxUSE_SCROLLBAR
+    if (
+#if wxUSE_SCROLLBAR
+        !m_scrollbarHorz ||
+#endif // wxUSE_SCROLLBAR
+        inside )

         height += rectBorder.height;
 
     wxWindowNative::DoSetClientSize(width, height);
         height += rectBorder.height;
 
     wxWindowNative::DoSetClientSize(width, height);


@@ -682,6 +791,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 )


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

+#endif // wxUSE_SCROLLBAR

 
     return ht;
 }
 
     return ht;
 }


@@ -708,15 +820,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
 


@@ -762,6 +877,7 @@ void wxWindow::PositionScrollbars()
     }
 
     RefreshScrollbars();
     }
 
     RefreshScrollbars();

+#endif // wxUSE_SCROLLBAR

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


@@ -770,10 +886,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) )
     {


@@ -781,14 +898,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;


@@ -796,7 +913,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();
         }


@@ -829,7 +946,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 )


@@ -843,17 +960,29 @@ void wxWindow::SetScrollbar(int orient,
     // give the window a chance to relayout
     if ( hasClientSizeChanged )
     {
     // give the window a chance to relayout
     if ( hasClientSizeChanged )
     {

+#if wxUSE_TWO_WINDOWS
+        wxWindowNative::SetSize( GetSize() );
+#else

         wxSizeEvent event(GetSize());
         (void)GetEventHandler()->ProcessEvent(event);
         wxSizeEvent event(GetSize());
         (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


@@ -861,24 +990,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)


@@ -889,7 +1037,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();


@@ -899,33 +1047,35 @@ 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:    
+
+    // scroll children accordingly:

     wxPoint offset(dx, dy);
     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
 
         // 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();


@@ -944,8 +1094,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)


@@ -1028,12 +1178,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)"),


@@ -1117,7 +1267,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;
 


@@ -1234,7 +1384,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


@@ -1267,7 +1417,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 )
     {


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

-