Corrected memory.cpp compilation error; Cygwin makefile uses generic wxDirDlg

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

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index 886418996f050cda8ea838ae541e98d51d77574b..f59657cefd21f293b46fa95be77fcf955d5fabf3 100644 (file)
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -31,7 +31,7 @@
 extern wxWindow *wxWndHook;
 extern LONG APIENTRY _EXPORT wxDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 
-bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxWindowID& id)
+bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id)
 {
        m_windowId = id;
     wxWndHook = this;
@@ -91,12 +91,12 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name)
        return TRUE;
 }
 
-wxWindow* wxWindow::GetWindowChild1(const wxWindowID& id)
+wxWindow* wxWindow::GetWindowChild1(wxWindowID& id)
 {
        if ( m_windowId == id )
                return this;
 
-       wxNode *node = GetChildren()->First();
+       wxNode *node = GetChildren().First();
        while ( node )
        {
                wxWindow* child = (wxWindow*) node->Data();
@@ -109,7 +109,7 @@ wxWindow* wxWindow::GetWindowChild1(const wxWindowID& id)
        return NULL;
 }
 
-wxWindow* wxWindow::GetWindowChild(const wxWindowID& id)
+wxWindow* wxWindow::GetWindowChild(wxWindowID& id)
 {
        wxWindow* win = GetWindowChild1(id);
        if ( !win )
@@ -174,7 +174,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
                {
                        // TODO: how to find the bitmap?
                        win = new wxBitmapButton;
-                       wxMessageBox("Have not yet implemented bitmap button as BS_BITMAP button.");
+                       wxLogError("Have not yet implemented bitmap button as BS_BITMAP button.");
                }
 #endif
                else if (style1 == BS_OWNERDRAW)
@@ -199,7 +199,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
                {
                        char buf[256];
                        sprintf(buf, "Don't know what kind of button this is: id = %d", (int) id);
-                       wxMessageBox(buf);
+                       wxLogError(buf);
                }
        }
        else if (str == "COMBOBOX")
@@ -227,7 +227,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
 #if defined(__WIN95__)
        else if (str == "MSCTLS_UPDOWN32")
        {
-               win == new wxSpinButton;
+               win = new wxSpinButton;
        }
 #endif
        else if (str == "MSCTLS_TRACKBAR32")
@@ -247,7 +247,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
                        win = new wxStaticBitmap;
 
                        // Help! this doesn't correspond with the wxWin implementation.
-                       wxMessageBox("Please make SS_BITMAP statics into owner-draw buttons.");
+                       wxLogError("Please make SS_BITMAP statics into owner-draw buttons.");
                }
 #endif
        }
@@ -255,7 +255,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
        {
                wxString msg("Don't know how to convert from Windows class ");
                msg += str;
-               wxMessageBox(msg);
+               wxLogError(msg);
        }
 
        if (win)