updated so that the dll will compile successfully

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

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index 120ecad6b180be4141b3e79f8e6251fea9268b78..a99be6dbf8fc5944df295a47af47833dfd2e7937 100644 (file)
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -58,7 +58,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id)
        if (hWndNext)
          child = CreateWindowFromHWND(this, (WXHWND) hWndNext);
 
        if (hWndNext)
          child = CreateWindowFromHWND(this, (WXHWND) hWndNext);
 

-    while (hWndNext != NULL)
+    while (hWndNext != (HWND) NULL)

     {
        hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT);
           if (hWndNext)
     {
        hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT);
           if (hWndNext)


@@ -139,9 +139,13 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
 #else
 #ifdef UNICODE
        GetClassNameW((HWND) hWnd, buf, 256);
 #else
 #ifdef UNICODE
        GetClassNameW((HWND) hWnd, buf, 256);

+#else
+#ifdef __TWIN32__
+       GetClassName((HWND) hWnd, buf, 256);

 #else
        GetClassNameA((HWND) hWnd, buf, 256);
 #endif
 #else
        GetClassNameA((HWND) hWnd, buf, 256);
 #endif

+#endif

 #endif
 
        wxString str(buf);
 #endif
 
        wxString str(buf);


@@ -224,7 +228,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
        {
                win = new wxScrollBar;
        }
        {
                win = new wxScrollBar;
        }

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

        else if (str == "MSCTLS_UPDOWN32")
        {
                win = new wxSpinButton;
        else if (str == "MSCTLS_UPDOWN32")
        {
                win = new wxSpinButton;