X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4db172a3b318df9aff178eb6c5da149d56e0859..3f4a2351e4c677c88c18ea812b609477adee7380:/src/mac/classic/mdi.cpp diff --git a/src/mac/classic/mdi.cpp b/src/mac/classic/mdi.cpp index 2603ac21dd..5a7d9416a4 100644 --- a/src/mac/classic/mdi.cpp +++ b/src/mac/classic/mdi.cpp @@ -15,11 +15,10 @@ #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/menu.h" + #include "wx/settings.h" #endif -#include "wx/menu.h" -#include "wx/settings.h" - #include "wx/mac/private.h" #include "wx/mac/uma.h" @@ -60,16 +59,16 @@ wxMDIParentFrame::wxMDIParentFrame() m_clientWindow = NULL; m_currentChild = NULL; m_windowMenu = (wxMenu*) NULL; - m_parentFrameActive = TRUE; + m_parentFrameActive = true; } bool wxMDIParentFrame::Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) { m_clientWindow = NULL; m_currentChild = NULL; @@ -94,11 +93,11 @@ bool wxMDIParentFrame::Create(wxWindow *parent, } wxFrame::Create( parent , id , title , pos , size , style , name ) ; - m_parentFrameActive = TRUE; + m_parentFrameActive = true; OnCreateClient(); - return TRUE; + return true; } wxMDIParentFrame::~wxMDIParentFrame() @@ -252,7 +251,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, { SetName(name); - if ( id > -1 ) + if ( id != wxID_ANY ) m_windowId = id; else m_windowId = (int)NewControlId(); @@ -265,7 +264,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ; wxModelessWindows.Append(this); - return FALSE; + return false; } wxMDIChildFrame::~wxMDIChildFrame() @@ -378,7 +377,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE); wxModelessWindows.Append(this); - return TRUE; + return true; } // Get size *available for subwindows* i.e. excluding menu bar.