fixed handling of dst offset in wxAlphaBlend()

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

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index 8c8a4f17cffcbea3644efeb4a0265a84b1dcd98f..4892f9d8eb07b6e177d50c93ba448b0ce88fb4a7 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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"
 


@@ -142,8 +138,8 @@ bool wxWindow::Create(wxWindow *parent,
     // when calling the base window Create().
     wxWindowBase::SetWindowStyleFlag(style);
 
     // when calling the base window Create().
     wxWindowBase::SetWindowStyleFlag(style);
 

-    // if we should always have a vertical scrollbar, do show it
-    if ( style & wxALWAYS_SHOW_SB )
+    // if we allow or should always have a vertical scrollbar, make it
+    if ( style & wxVSCROLL || style & wxALWAYS_SHOW_SB )

     {
 #if wxUSE_TWO_WINDOWS
         SetInsertIntoMain( true );
     {
 #if wxUSE_TWO_WINDOWS
         SetInsertIntoMain( true );


@@ -156,7 +152,7 @@ bool wxWindow::Create(wxWindow *parent,
 #endif
     }
 
 #endif
     }
 

-    // if we should always have a horizontal scrollbar, do show it
+    // if we should allow a horizontal scrollbar, make it

     if ( style & wxHSCROLL )
     {
 #if wxUSE_TWO_WINDOWS
     if ( style & wxHSCROLL )
     {
 #if wxUSE_TWO_WINDOWS


@@ -343,7 +339,7 @@ bool wxWindow::DoDrawBackground(wxDC& dc)
     }
     else
     {
     }
     else
     {

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

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