Test using wxString::ToCDouble() in wxAny.

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

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index e483c687efd58791ba3e573617c19f72312aea39..d5cce1f1e547d7d2922c2dd13bff2f256f11c7a6 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:


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

-#if defined(__WIN95__)

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

-#endif

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


@@ -148,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;

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


@@ -170,6 +162,8 @@ wxWindow* wxWindow::GetWindowChild(wxWindowID id)
 
 wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
 {
 
 wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
 {

+    wxCHECK_MSG( parent, NULL, wxT("must have valid parent for a control") );
+

     wxString str(wxGetWindowClass(hWnd));
     str.UpperCase();
 
     wxString str(wxGetWindowClass(hWnd));
     str.UpperCase();
 


@@ -267,7 +261,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
         win = new wxScrollBar;
     }
 #endif
         win = new wxScrollBar;
     }
 #endif

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

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


@@ -314,9 +308,6 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
     if (win)
     {
         parent->AddChild(win);
     if (win)
     {
         parent->AddChild(win);

-        win->SetEventHandler(win);
-        win->SetHWND(hWnd);
-        win->SetId(id);

         win->SubclassWin(hWnd);
         win->AdoptAttributesFromHWND();
         win->SetupColours();
         win->SubclassWin(hWnd);
         win->AdoptAttributesFromHWND();
         win->SetupColours();


@@ -326,14 +317,14 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
 }
 
 // Make sure the window style (etc.) reflects the HWND style (roughly)
 }
 
 // Make sure the window style (etc.) reflects the HWND style (roughly)

-void wxWindow::AdoptAttributesFromHWND(void)
+void wxWindow::AdoptAttributesFromHWND()

 {
 {

-    HWND hWnd = (HWND) GetHWND();
-    long style = GetWindowLong((HWND) hWnd, GWL_STYLE);
+    SetId(wxGetWindowId(m_hWnd));
+
+    long style = GetWindowLong(GetHwnd(), GWL_STYLE);

 
     if (style & WS_VSCROLL)
         m_windowStyle |= wxVSCROLL;
     if (style & WS_HSCROLL)
         m_windowStyle |= wxHSCROLL;
 }
 
     if (style & WS_VSCROLL)
         m_windowStyle |= wxVSCROLL;
     if (style & WS_HSCROLL)
         m_windowStyle |= wxHSCROLL;
 }

-