fixes for rotated text drawing

[wxWidgets.git] / src / msw / statbmp.cpp

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 2f54f08674ce4c368af38db30a08d7cc6600838d..f51c590ce6900871319c77fb04b736557d9f4724 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_STATBMP
+

 #include "wx/window.h"
 #include "wx/msw/private.h"
 
 #include "wx/window.h"
 #include "wx/msw/private.h"
 


@@ -85,6 +87,12 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     // be ignored by Windows
     wxIcon *icon = (wxIcon *)NULL;
     m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
     // be ignored by Windows
     wxIcon *icon = (wxIcon *)NULL;
     m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));

+
+#ifdef __WIN16__
+    wxASSERT_MSG( !m_isIcon, "Icons are not supported in wxStaticBitmap under WIN16." );
+#endif
+
+#ifndef __WIN16__

     if ( !m_isIcon )
     {
         const wxBitmap& bmp = (const wxBitmap&)bitmap;
     if ( !m_isIcon )
     {
         const wxBitmap& bmp = (const wxBitmap&)bitmap;


@@ -97,6 +105,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
             m_isIcon = TRUE;
         }
     }
             m_isIcon = TRUE;
         }
     }

+#endif

 
 #ifdef __WIN32__
     // create a static control with either SS_BITMAP or SS_ICON style depending
 
 #ifdef __WIN32__
     // create a static control with either SS_BITMAP or SS_ICON style depending


@@ -108,12 +117,16 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     int winstyle = BS_OWNERDRAW;
 #endif // Win32
 
     int winstyle = BS_OWNERDRAW;
 #endif // Win32
 

+    if ( m_windowStyle & wxCLIP_SIBLINGS )
+        winstyle |= WS_CLIPSIBLINGS;
+
+

     m_hWnd = (WXHWND)::CreateWindow
                        (
                         classname,
                         wxT(""),
                         // NOT DISABLED!!! We want to move it in Dialog Editor.
     m_hWnd = (WXHWND)::CreateWindow
                        (
                         classname,
                         wxT(""),
                         // NOT DISABLED!!! We want to move it in Dialog Editor.

-                        winstyle | WS_CHILD | WS_VISIBLE, // | WS_DISABLED,
+                        winstyle | WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */ , // | WS_DISABLED,

                         0, 0, 0, 0,
                         (HWND)parent->GetHWND(),
                         (HMENU)m_windowId,
                         0, 0, 0, 0,
                         (HWND)parent->GetHWND(),
                         (HMENU)m_windowId,


@@ -259,3 +272,4 @@ long wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 

+#endif // wxUSE_STATBMP