* wxMemory*Stream link problem fix.

[wxWidgets.git] / src / common / tbarbase.cpp

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 60de3c71a3f459fe0a7d43c7d97f08a6b855da75..b7322ac3f9d599f43504da8249263c3f5e9c462a 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -25,7 +25,7 @@
 #endif
 
 // For ::UpdateWindow
 #endif
 
 // For ::UpdateWindow

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 #include <windows.h>
 #endif
 
 #include <windows.h>
 #endif
 


@@ -500,7 +500,7 @@ void wxToolBarBase::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
     }
        AdjustScrollbars();
     Refresh();
     }
        AdjustScrollbars();
     Refresh();

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

     ::UpdateWindow ((HWND) GetHWND());
 #endif
 }
     ::UpdateWindow ((HWND) GetHWND());
 #endif
 }


@@ -755,7 +755,7 @@ void wxToolBarBase::Scroll (int x_pos, int y_pos)
       SetScrollPos (wxVERTICAL, y_pos, TRUE);
     }
   Refresh();
       SetScrollPos (wxVERTICAL, y_pos, TRUE);
     }
   Refresh();

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   UpdateWindow ((HWND) GetHWND());
 #endif
 }
   UpdateWindow ((HWND) GetHWND());
 #endif
 }


@@ -827,7 +827,7 @@ void wxToolBarBase::DoToolbarUpdates(void)
        }
 }
 
        }
 }
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 // Circumvent wxControl::MSWOnMouseMove which doesn't set the cursor.
 void wxToolBarBase::MSWOnMouseMove(int x, int y, const WXUINT flags)
 {
 // Circumvent wxControl::MSWOnMouseMove which doesn't set the cursor.
 void wxToolBarBase::MSWOnMouseMove(int x, int y, const WXUINT flags)
 {