corrected path splitting for mac relative paths

[wxWidgets.git] / src / os2 / gauge.cpp

diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp
index c1fe612f6c8c1bd3a4a479801be38f572450dd76..b7700f4147cbf29e2a47ea18f36c0bc5305aaf63 100644 (file)
--- a/src/os2/gauge.cpp
+++ b/src/os2/gauge.cpp
@@ -14,6 +14,7 @@
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
 #include "wx/utils.h"
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
 #include "wx/utils.h"

+#include "wx/scrolwin.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"


@@ -155,7 +156,14 @@ bool wxGauge::Create(
     if (m_windowStyle & wxCLIP_SIBLINGS)
         lMsStyle |= WS_CLIPSIBLINGS;
 
     if (m_windowStyle & wxCLIP_SIBLINGS)
         lMsStyle |= WS_CLIPSIBLINGS;
 

-
+    //
+    // If the parent is a scrolled window the controls must
+    // have this style or they will overlap the scrollbars
+    //
+    if (pParent)
+        if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow)) ||
+            pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)))
+            lMsStyle |= WS_CLIPSIBLINGS;

 
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
                                        ,WC_ENTRYFIELD            // Window class
 
     m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
                                        ,WC_ENTRYFIELD            // Window class