X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/461dae941dac51a523a4280d3e1800143b720305..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/msw/nativdlg.cpp diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp index 519176b336..0f86383b8d 100644 --- 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: @@ -17,10 +17,6 @@ // headers // --------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -34,9 +30,7 @@ #include "wx/wx.h" #endif -#if defined(__WIN95__) #include "wx/spinbutt.h" -#endif #include "wx/msw/private.h" // --------------------------------------------------------------------------- @@ -61,7 +55,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id) (DLGPROC) wxDlgProc); if ( !m_hWnd ) - return FALSE; + return false; SubclassWin(GetHWND()); @@ -84,7 +78,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id) CreateWindowFromHWND(this, (WXHWND) hWndNext); } - return TRUE; + return true; } bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name) @@ -98,7 +92,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name) (DLGPROC)wxDlgProc); if ( !m_hWnd ) - return FALSE; + return false; SubclassWin(GetHWND()); @@ -121,7 +115,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name) CreateWindowFromHWND(this, (WXHWND) hWndNext); } - return TRUE; + return true; } // --------------------------------------------------------------------------- @@ -152,20 +146,14 @@ wxWindow* wxWindow::GetWindowChild(wxWindowID id) 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; } // --------------------------------------------------------------------------- @@ -271,7 +259,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd) win = new wxScrollBar; } #endif -#if defined(__WIN95__) && wxUSE_SPINBTN +#if wxUSE_SPINBTN else if (str == wxT("MSCTLS_UPDOWN32")) { win = new wxSpinButton; @@ -305,7 +293,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd) wxLogError(wxT("Please make SS_BITMAP statics into owner-draw buttons.")); } #endif -#endif /* wxUSE_STATBMP */ +#endif /* wxUSE_STATBMP */ } #endif else @@ -340,4 +328,3 @@ void wxWindow::AdoptAttributesFromHWND(void) if (style & WS_HSCROLL) m_windowStyle |= wxHSCROLL; } -