Add accelerator back to label in GetItemLabel

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

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index 5d251c9cc8d86d52c1760c8e61cfa0909bb39f08..0f86383b8d4ef0a64c67f352f0750d99ac686eb7 100644 (file)
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        nativdlg.cpp
+// Name:        src/msw/nativdlg.cpp

 // Purpose:     Native dialog loading code (part of wxWindow)
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Native dialog loading code (part of wxWindow)
 // Author:      Julian Smart
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


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

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

 #include "wx/spinbutt.h"
 #include "wx/spinbutt.h"

-#endif

 #include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------
 #include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------


@@ -61,7 +55,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id)
                                     (DLGPROC) wxDlgProc);
 
     if ( !m_hWnd )
                                     (DLGPROC) wxDlgProc);
 
     if ( !m_hWnd )

-        return FALSE;
+        return false;

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


@@ -74,18 +68,17 @@ 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)
 }
 
 bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name)


@@ -99,7 +92,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name)
                                     (DLGPROC)wxDlgProc);
 
     if ( !m_hWnd )
                                     (DLGPROC)wxDlgProc);
 
     if ( !m_hWnd )

-        return FALSE;
+        return false;

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


@@ -108,9 +101,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);

 
 

-    return TRUE;
+    while (hWndNext != (HWND) NULL)
+    {
+        hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT);
+        if (hWndNext)
+            CreateWindowFromHWND(this, (WXHWND) hWndNext);
+    }
+
+    return true;

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


@@ -122,7 +127,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();


@@ -141,20 +146,14 @@ wxWindow* wxWindow::GetWindowChild(wxWindowID id)
     wxWindow* win = GetWindowChild1(id);
     if ( !win )
     {
     wxWindow* win = GetWindowChild1(id);
     if ( !win )
     {

-        HWND hWnd = ::GetDlgItem((HWND) GetHWND(), id);
-
-        if (hWnd)
+        HWND hwnd = ::GetDlgItem(GetHwnd(), id);
+        if ( hwnd )

         {
         {

-            wxWindow* child = CreateWindowFromHWND(this, (WXHWND) hWnd);
-            if (child)
-            {
-                child->AddChild(this);
-                return child;
-            }
+            win = CreateWindowFromHWND(this, (WXHWND) hwnd);

         }
     }
 
         }
     }
 

-    return NULL;
+    return win;

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


@@ -174,25 +173,32 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
     if (str == wxT("BUTTON"))
     {
         int style1 = (style & 0xFF);
     if (str == wxT("BUTTON"))
     {
         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 wxUSE_BMPBUTTON
 #if defined(__WIN32__) && defined(BS_BITMAP)

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

         {
             // TODO: how to find the bitmap?
             win = new wxBitmapButton;
             wxLogError(wxT("Have not yet implemented bitmap button as BS_BITMAP button."));
         }
         {
             // TODO: how to find the bitmap?
             win = new wxBitmapButton;
             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.


@@ -202,25 +208,34 @@ 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

 #endif
 #endif

-        else if ((style1 == BS_PUSHBUTTON) || (style1 == BS_DEFPUSHBUTTON))
+#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(wxT("Don't know what kind of button this is: id = %ld"),
                        id);
         }
     }
         {
             wxLogError(wxT("Don't know what kind of button this is: id = %ld"),
                        id);
         }
     }

+#if wxUSE_COMBOBOX

     else if (str == wxT("COMBOBOX"))
     {
         win = new wxComboBox;
     }
     else if (str == wxT("COMBOBOX"))
     {
         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
     // 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


@@ -231,15 +246,20 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
     {
         win = new wxTextCtrl;
     }
     {
         win = new wxTextCtrl;
     }

+#endif
+#if wxUSE_LISTBOX

     else if (str == wxT("LISTBOX"))
     {
         win = new wxListBox;
     }
     else if (str == wxT("LISTBOX"))
     {
         win = new wxListBox;
     }

+#endif
+#if wxUSE_SCROLLBAR

     else if (str == wxT("SCROLLBAR"))
     {
         win = new wxScrollBar;
     }
     else if (str == wxT("SCROLLBAR"))
     {
         win = new wxScrollBar;
     }

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

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


@@ -252,11 +272,16 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
         win = new wxSlider;
     }
 #endif // wxUSE_SLIDER
         win = new wxSlider;
     }
 #endif // wxUSE_SLIDER

+#if wxUSE_STATTEXT

     else if (str == wxT("STATIC"))
     {
         int style1 = (style & 0xFF);
 
     else if (str == wxT("STATIC"))
     {
         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;
 #if wxUSE_STATBMP
 #if defined(__WIN32__) && defined(BS_BITMAP)
             win = new wxStaticText;
 #if wxUSE_STATBMP
 #if defined(__WIN32__) && defined(BS_BITMAP)


@@ -268,8 +293,9 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
             wxLogError(wxT("Please make SS_BITMAP statics into owner-draw buttons."));
         }
 #endif
             wxLogError(wxT("Please make SS_BITMAP statics into owner-draw buttons."));
         }
 #endif

-#endif /* wxUSE_STATBMP */
+#endif /* wxUSE_STATBMP */

     }
     }

+#endif

     else
     {
         wxString msg(wxT("Don't know how to convert from Windows class "));
     else
     {
         wxString msg(wxT("Don't know how to convert from Windows class "));


@@ -302,4 +328,3 @@ void wxWindow::AdoptAttributesFromHWND(void)
     if (style & WS_HSCROLL)
         m_windowStyle |= wxHSCROLL;
 }
     if (style & WS_HSCROLL)
         m_windowStyle |= wxHSCROLL;
 }

-