fixes for rotated text drawing

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

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index 9ce9195d15e80e15ff02c1461ae7b3601399fec0..d77267951f3c00fe5f17cc8ea7a499026a13b09f 100644 (file)
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -245,11 +245,13 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
         win = new wxSpinButton;
     }
 #endif
         win = new wxSpinButton;
     }
 #endif

+#if wxUSE_SLIDER

     else if (str == wxT("MSCTLS_TRACKBAR32"))
     {
         // Need to ascertain if it's horiz or vert
         win = new wxSlider;
     }
     else if (str == wxT("MSCTLS_TRACKBAR32"))
     {
         // Need to ascertain if it's horiz or vert
         win = new wxSlider;
     }

+#endif // wxUSE_SLIDER

     else if (str == wxT("STATIC"))
     {
         int style1 = (style & 0xFF);
     else if (str == wxT("STATIC"))
     {
         int style1 = (style & 0xFF);


@@ -282,11 +284,9 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
         win->SubclassWin(hWnd);
         win->AdoptAttributesFromHWND();
         win->SetupColours();
         win->SubclassWin(hWnd);
         win->AdoptAttributesFromHWND();
         win->SetupColours();

-
-        return win;

     }
     }

-    else
-        return NULL;
+
+    return win;

 }
 
 // Make sure the window style (etc.) reflects the HWND style (roughly)
 }
 
 // Make sure the window style (etc.) reflects the HWND style (roughly)