X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..bcd846ea7191d33d86e28ee1927b461c54d2fb8f:/src/mgl/toplevel.cpp diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp index 8abe18411c..69bbdf584a 100644 --- a/src/mgl/toplevel.cpp +++ b/src/mgl/toplevel.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: toplevel.cpp +// Name: src/mgl/toplevel.cpp // Purpose: // Author: Vaclav Slavik // Id: $Id$ @@ -48,11 +48,11 @@ extern int g_openDialogs; void wxTopLevelWindowMGL::Init() { - m_isShown = FALSE; - m_isIconized = FALSE; - m_isMaximized = FALSE; - m_fsIsShowing = FALSE; - m_sizeSet = FALSE; + m_isShown = false; + m_isIconized = false; + m_isMaximized = false; + m_fsIsShowing = false; + m_sizeSet = false; } bool wxTopLevelWindowMGL::Create(wxWindow *parent, @@ -66,27 +66,27 @@ bool wxTopLevelWindowMGL::Create(wxWindow *parent, // always create a frame of some reasonable, even if arbitrary, size (at // least for MSW compatibility) wxSize size = sizeOrig; - if ( size.x == -1 || size.y == -1 ) + if ( size.x == wxDefaultCoord || size.y == wxDefaultCoord ) { wxSize sizeDefault = GetDefaultSize(); - if ( size.x == -1 ) + if ( size.x == wxDefaultCoord ) size.x = sizeDefault.x; - if ( size.y == -1 ) + if ( size.y == wxDefaultCoord ) size.y = sizeDefault.y; } - + // for default positioning, centre the first top level window and // cascade any addtional ones from there. wxPoint pos = posOrig; - if ( pos.x == -1 || pos.y == -1 ) + if ( pos.x == wxDefaultCoord || pos.y == wxDefaultCoord ) { wxSize sizeDisplay = wxGetDisplaySize(); static wxPoint nextPos((sizeDisplay.x - size.x) / 2, (sizeDisplay.y - size.y) / 2); - if ( pos.x == -1 ) + if ( pos.x == wxDefaultCoord ) pos.x = nextPos.x; - if ( pos.y == -1 ) + if ( pos.y == wxDefaultCoord ) pos.y = nextPos.y; if ( pos.x + size.x > sizeDisplay.x || pos.y + size.y > sizeDisplay.y ) pos = wxPoint(); @@ -103,12 +103,12 @@ bool wxTopLevelWindowMGL::Create(wxWindow *parent, wxTopLevelWindows.Append(this); m_title = title; - return TRUE; + return true; } wxTopLevelWindowMGL::~wxTopLevelWindowMGL() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; wxTopLevelWindows.DeleteObject(this); @@ -124,7 +124,7 @@ wxTopLevelWindowMGL::~wxTopLevelWindowMGL() bool wxTopLevelWindowMGL::ShowFullScreen(bool show, long style) { - if (show == m_fsIsShowing) return FALSE; // return what? + if (show == m_fsIsShowing) return false; // return what? m_fsIsShowing = show; @@ -147,11 +147,11 @@ bool wxTopLevelWindowMGL::ShowFullScreen(bool show, long style) else { m_windowStyle = m_fsSaveStyle; - SetSize(m_fsSaveFrame.x, m_fsSaveFrame.y, + SetSize(m_fsSaveFrame.x, m_fsSaveFrame.y, m_fsSaveFrame.width, m_fsSaveFrame.height); } - return TRUE; + return true; } bool wxTopLevelWindowMGL::Show(bool show) @@ -162,7 +162,7 @@ bool wxTopLevelWindowMGL::Show(bool show) // so that the frame can adjust itself (think auto layout or single child) if ( !m_sizeSet ) { - m_sizeSet = TRUE; + m_sizeSet = true; wxSizeEvent event(GetSize(), GetId()); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); @@ -184,7 +184,7 @@ void wxTopLevelWindowMGL::Maximize(bool maximize) if ( maximize && !m_isMaximized ) { - m_isMaximized = TRUE; + m_isMaximized = true; GetPosition(&m_savedFrame.x, &m_savedFrame.y); GetSize(&m_savedFrame.width, &m_savedFrame.height); @@ -193,8 +193,8 @@ void wxTopLevelWindowMGL::Maximize(bool maximize) } else if ( !maximize && m_isMaximized ) { - m_isMaximized = FALSE; - SetSize(m_savedFrame.x, m_savedFrame.y, + m_isMaximized = false; + SetSize(m_savedFrame.x, m_savedFrame.y, m_savedFrame.width, m_savedFrame.height); } } @@ -208,11 +208,11 @@ void wxTopLevelWindowMGL::Restore() { if ( IsIconized() ) { - Iconize(FALSE); + Iconize(false); } if ( IsMaximized() ) { - Maximize(FALSE); + Maximize(false); } }