replace use of deprecated GtkPixmap

[wxWidgets.git] / src / mac / classic / mdi.cpp

diff --git a/src/mac/classic/mdi.cpp b/src/mac/classic/mdi.cpp
index 2603ac21dde66ab5faa6dae72017bd12ec13c3d4..5a7d9416a4bb8f2fa238129a1d383f1525b60f87 100644 (file)
--- a/src/mac/classic/mdi.cpp
+++ b/src/mac/classic/mdi.cpp
@@ -15,11 +15,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/menu.h"
+    #include "wx/settings.h"

 #endif
 
 #endif
 

-#include "wx/menu.h"
-#include "wx/settings.h"
-

 #include "wx/mac/private.h"
 #include "wx/mac/uma.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_clientWindow = NULL;
     m_currentChild = NULL;
     m_windowMenu = (wxMenu*) NULL;

-    m_parentFrameActive = TRUE;
+    m_parentFrameActive = true;

 }
 
 bool wxMDIParentFrame::Create(wxWindow *parent,
 }
 
 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;
 {
     m_clientWindow = NULL;
     m_currentChild = NULL;


@@ -94,11 +93,11 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
     }
 
     wxFrame::Create( parent , id , title , pos , size , style , name ) ;
     }
 
     wxFrame::Create( parent , id , title , pos , size , style , name ) ;

-    m_parentFrameActive = TRUE;
+    m_parentFrameActive = true;

 
     OnCreateClient();
 
 
     OnCreateClient();
 

-    return TRUE;
+    return true;

 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()


@@ -252,7 +251,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 {
     SetName(name);
 
 {
     SetName(name);
 

-    if ( id > -1 )
+    if ( id != wxID_ANY )

         m_windowId = id;
     else
         m_windowId = (int)NewControlId();
         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);
     SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
 
     wxModelessWindows.Append(this);

-    return FALSE;
+    return false;

 }
 
 wxMDIChildFrame::~wxMDIChildFrame()
 }
 
 wxMDIChildFrame::~wxMDIChildFrame()


@@ -378,7 +377,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
 
     wxModelessWindows.Append(this);
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
 
     wxModelessWindows.Append(this);

-    return TRUE;
+    return true;

 }
 
 // Get size *available for subwindows* i.e. excluding menu bar.
 }
 
 // Get size *available for subwindows* i.e. excluding menu bar.