Add comments explaining the workaround for mingw 3.2.3

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

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index 0d9fca1ca289278722cf903faf97fbeb368b0943..fd61bcf8e2536ecf2af64c587ba9f17712cd1436 100644 (file)
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation
 #endif
 
     #pragma implementation
 #endif
 


@@ -34,7 +34,7 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

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

 #include "wx/spinbutt.h"
 #endif
 #include "wx/msw/private.h"
 #include "wx/spinbutt.h"
 #endif
 #include "wx/msw/private.h"


@@ -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,15 +53,15 @@ 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 )
 
     if ( !m_hWnd )

-        return FALSE;
+        return false;

 
     SubclassWin(GetHWND());
 
 
     SubclassWin(GetHWND());
 


@@ -75,33 +74,31 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id)
     HWND hWndNext;
     hWndNext = ::GetWindow((HWND) m_hWnd, GW_CHILD);
 
     HWND hWndNext;
     hWndNext = ::GetWindow((HWND) m_hWnd, GW_CHILD);
 

-    wxWindow* child = NULL;

     if (hWndNext)
     if (hWndNext)

-        child = CreateWindowFromHWND(this, (WXHWND) hWndNext);
+        CreateWindowFromHWND(this, (WXHWND) hWndNext);

 
     while (hWndNext != (HWND) NULL)
     {
         hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT);
         if (hWndNext)
 
     while (hWndNext != (HWND) NULL)
     {
         hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT);
         if (hWndNext)

-            child = CreateWindowFromHWND(this, (WXHWND) hWndNext);
+            CreateWindowFromHWND(this, (WXHWND) hWndNext);

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name)
 {
     SetName(name);
 
 }
 
 bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& 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 )
 
     if ( !m_hWnd )

-        return FALSE;
+        return false;

 
     SubclassWin(GetHWND());
 
 
     SubclassWin(GetHWND());
 


@@ -110,9 +107,21 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name)
     else
         wxTopLevelWindows.Append(this);
 
     else
         wxTopLevelWindows.Append(this);
 

-    // FIXME why don't we enum all children here?
+    // Enumerate all children
+    HWND hWndNext;
+    hWndNext = ::GetWindow((HWND) m_hWnd, GW_CHILD);
+
+    if (hWndNext)
+        CreateWindowFromHWND(this, (WXHWND) hWndNext);
+
+    while (hWndNext != (HWND) NULL)
+    {
+        hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT);
+        if (hWndNext)
+            CreateWindowFromHWND(this, (WXHWND) hWndNext);
+    }

 
 

-    return TRUE;
+    return true;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -124,7 +133,7 @@ wxWindow* wxWindow::GetWindowChild1(wxWindowID id)
     if ( m_windowId == id )
         return this;
 
     if ( m_windowId == id )
         return this;
 

-    wxWindowList::Node *node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while ( node )
     {
         wxWindow* child = node->GetData();
     while ( node )
     {
         wxWindow* child = node->GetData();


@@ -173,27 +182,35 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
 
     wxWindow* win = NULL;
 
 
     wxWindow* win = NULL;
 

-    if (str == T("BUTTON"))
+    if (str == wxT("BUTTON"))

     {
         int style1 = (style & 0xFF);
     {
         int style1 = (style & 0xFF);

+#if wxUSE_CHECKBOX

         if ((style1 == BS_3STATE) || (style1 == BS_AUTO3STATE) || (style1 == BS_AUTOCHECKBOX) ||
             (style1 == BS_CHECKBOX))
         {
             win = new wxCheckBox;
         }
         if ((style1 == BS_3STATE) || (style1 == BS_AUTO3STATE) || (style1 == BS_AUTOCHECKBOX) ||
             (style1 == BS_CHECKBOX))
         {
             win = new wxCheckBox;
         }

-        else if ((style1 == BS_AUTORADIOBUTTON) || (style1 == BS_RADIOBUTTON))
+        else
+#endif
+#if wxUSE_RADIOBTN
+        if ((style1 == BS_AUTORADIOBUTTON) || (style1 == BS_RADIOBUTTON))

         {
             win = new wxRadioButton;
         }
         {
             win = new wxRadioButton;
         }

+        else
+#endif
+#if wxUSE_BMPBUTTON

 #if defined(__WIN32__) && defined(BS_BITMAP)
 #if defined(__WIN32__) && defined(BS_BITMAP)

-        else if (style & BS_BITMAP)
+        if (style & BS_BITMAP)

         {
             // TODO: how to find the bitmap?
             win = new wxBitmapButton;
         {
             // TODO: how to find the bitmap?
             win = new wxBitmapButton;

-            wxLogError(T("Have not yet implemented bitmap button as BS_BITMAP button."));
+            wxLogError(wxT("Have not yet implemented bitmap button as BS_BITMAP button."));

         }
         }

+        else

 #endif
 #endif

-        else if (style1 == BS_OWNERDRAW)
+        if (style1 == BS_OWNERDRAW)

         {
             // TODO: how to find the bitmap?
             // TODO: can't distinguish between bitmap button and bitmap static.
         {
             // TODO: how to find the bitmap?
             // TODO: can't distinguish between bitmap button and bitmap static.


@@ -203,72 +220,97 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
             // with a switch in the drawing code. Call default proc if BS_BITMAP.
             win = new wxBitmapButton;
         }
             // with a switch in the drawing code. Call default proc if BS_BITMAP.
             win = new wxBitmapButton;
         }

-        else if ((style1 == BS_PUSHBUTTON) || (style1 == BS_DEFPUSHBUTTON))
+        else
+#endif
+#if wxUSE_BUTTON
+        if ((style1 == BS_PUSHBUTTON) || (style1 == BS_DEFPUSHBUTTON))

         {
             win = new wxButton;
         }
         {
             win = new wxButton;
         }

-        else if (style1 == BS_GROUPBOX)
+        else
+#endif
+#if wxUSE_STATBOX
+        if (style1 == BS_GROUPBOX)

         {
             win = new wxStaticBox;
         }
         else
         {
             win = new wxStaticBox;
         }
         else

+#endif

         {
         {

-            wxLogError(T("Don't know what kind of button this is: id = %d"),
+            wxLogError(wxT("Don't know what kind of button this is: id = %ld"),

                        id);
         }
     }
                        id);
         }
     }

-    else if (str == T("COMBOBOX"))
+#if wxUSE_COMBOBOX
+    else if (str == wxT("COMBOBOX"))

     {
         win = new wxComboBox;
     }
     {
         win = new wxComboBox;
     }

+#endif
+#if wxUSE_TEXTCTRL

     // TODO: Problem if the user creates a multiline - but not rich text - text control,
     // since wxWin assumes RichEdit control for this. Should have m_isRichText in
     // wxTextCtrl. Also, convert as much of the window style as is necessary
     // for correct functioning.
     // Could have wxWindow::AdoptAttributesFromHWND(WXHWND)
     // to be overridden by each control class.
     // TODO: Problem if the user creates a multiline - but not rich text - text control,
     // since wxWin assumes RichEdit control for this. Should have m_isRichText in
     // wxTextCtrl. Also, convert as much of the window style as is necessary
     // for correct functioning.
     // Could have wxWindow::AdoptAttributesFromHWND(WXHWND)
     // to be overridden by each control class.

-    else if (str == T("EDIT("))
+    else if (str == wxT("EDIT"))

     {
         win = new wxTextCtrl;
     }
     {
         win = new wxTextCtrl;
     }

-    else if (str == T("LISTBOX"))
+#endif
+#if wxUSE_LISTBOX
+    else if (str == wxT("LISTBOX"))

     {
         win = new wxListBox;
     }
     {
         win = new wxListBox;
     }

-    else if (str == T("SCROLLBAR"))
+#endif
+#if wxUSE_SCROLLBAR
+    else if (str == wxT("SCROLLBAR"))

     {
         win = new wxScrollBar;
     }
     {
         win = new wxScrollBar;
     }

-#if defined(__WIN95__) && !defined(__TWIN32__)
-    else if (str == T("MSCTLS_UPDOWN32"))
+#endif
+#if defined(__WIN95__) && wxUSE_SPINBTN
+    else if (str == wxT("MSCTLS_UPDOWN32"))

     {
         win = new wxSpinButton;
     }
 #endif
     {
         win = new wxSpinButton;
     }
 #endif

-    else if (str == T("MSCTLS_TRACKBAR32"))
+#if wxUSE_SLIDER
+    else if (str == wxT("MSCTLS_TRACKBAR32"))

     {
         // Need to ascertain if it's horiz or vert
         win = new wxSlider;
     }
     {
         // Need to ascertain if it's horiz or vert
         win = new wxSlider;
     }

-    else if (str == T("STATIC"))
+#endif // wxUSE_SLIDER
+#if wxUSE_STATTEXT
+    else if (str == wxT("STATIC"))

     {
         int style1 = (style & 0xFF);
 
     {
         int style1 = (style & 0xFF);
 

-        if ((style1 == SS_LEFT) || (style1 == SS_RIGHT) || (style1 == SS_SIMPLE))
+        if ((style1 == SS_LEFT) || (style1 == SS_RIGHT)
+#ifndef __WXWINCE__
+            || (style1 == SS_SIMPLE)
+#endif
+            )

             win = new wxStaticText;
             win = new wxStaticText;

+#if wxUSE_STATBMP

 #if defined(__WIN32__) && defined(BS_BITMAP)
         else if (style1 == SS_BITMAP)
         {
             win = new wxStaticBitmap;
 
             // Help! this doesn't correspond with the wxWin implementation.
 #if defined(__WIN32__) && defined(BS_BITMAP)
         else if (style1 == SS_BITMAP)
         {
             win = new wxStaticBitmap;
 
             // Help! this doesn't correspond with the wxWin implementation.

-            wxLogError(T("Please make SS_BITMAP statics into owner-draw buttons."));
+            wxLogError(wxT("Please make SS_BITMAP statics into owner-draw buttons."));

         }
 #endif
         }
 #endif

+#endif /* wxUSE_STATBMP */

     }
     }

+#endif

     else
     {
     else
     {

-        wxString msg(T("Don't know how to convert from Windows class "));
+        wxString msg(wxT("Don't know how to convert from Windows class "));

         msg += str;
         wxLogError(msg);
     }
         msg += str;
         wxLogError(msg);
     }


@@ -282,11 +324,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)