blind fix for wxGIFDecoder::ReadGIF

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

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index ce9a5db6b8555e67b6f82562f198039214a103b0..85a7920b99224fcab297d6dc20333763ddd240b8 100644 (file)
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -43,7 +43,6 @@
 // global functions
 // ---------------------------------------------------------------------------
 
 // global functions
 // ---------------------------------------------------------------------------
 

-extern wxWindow *wxWndHook;

 extern LONG APIENTRY _EXPORT wxDlgProc(HWND hWnd, UINT message,
                                        WPARAM wParam, LPARAM lParam);
 
 extern LONG APIENTRY _EXPORT wxDlgProc(HWND hWnd, UINT message,
                                        WPARAM wParam, LPARAM lParam);
 


@@ -54,12 +53,12 @@ extern LONG APIENTRY _EXPORT wxDlgProc(HWND hWnd, UINT message,
 bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id)
 {
     m_windowId = id;
 bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id)
 {
     m_windowId = id;

-    wxWndHook = this;
+
+    wxWindowCreationHook hook(this);

     m_hWnd = (WXHWND)::CreateDialog((HINSTANCE)wxGetInstance(),
                                     MAKEINTRESOURCE(id),
                                     parent ? (HWND)parent->GetHWND() : 0,
                                     (DLGPROC) wxDlgProc);
     m_hWnd = (WXHWND)::CreateDialog((HINSTANCE)wxGetInstance(),
                                     MAKEINTRESOURCE(id),
                                     parent ? (HWND)parent->GetHWND() : 0,
                                     (DLGPROC) wxDlgProc);

-    wxWndHook = NULL;

 
     if ( !m_hWnd )
         return FALSE;
 
     if ( !m_hWnd )
         return FALSE;


@@ -93,12 +92,11 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name)
 {
     SetName(name);
 
 {
     SetName(name);
 

-    wxWndHook = this;
+    wxWindowCreationHook hook(this);

     m_hWnd = (WXHWND)::CreateDialog((HINSTANCE) wxGetInstance(),
                                     name.c_str(),
                                     parent ? (HWND)parent->GetHWND() : 0,
                                     (DLGPROC)wxDlgProc);
     m_hWnd = (WXHWND)::CreateDialog((HINSTANCE) wxGetInstance(),
                                     name.c_str(),
                                     parent ? (HWND)parent->GetHWND() : 0,
                                     (DLGPROC)wxDlgProc);

-    wxWndHook = NULL;

 
     if ( !m_hWnd )
         return FALSE;
 
     if ( !m_hWnd )
         return FALSE;


@@ -239,17 +237,19 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
     {
         win = new wxScrollBar;
     }
     {
         win = new wxScrollBar;
     }

-#if defined(__WIN95__) && !defined(__TWIN32__)
+#if defined(__WIN95__) && !defined(__TWIN32__) && wxUSE_SPINBTN

     else if (str == wxT("MSCTLS_UPDOWN32"))
     {
         win = new wxSpinButton;
     }
 #endif
     else if (str == wxT("MSCTLS_UPDOWN32"))
     {
         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 +282,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)