fixing reset clip

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

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index ee4db9c392f07f6f2deba1a772e085f2ede3f634..108e0371d82527c6ec219553e3a050299a07951e 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -1,20 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mdi.cpp
+// Name:        src/mac/carbon/mdi.cpp

 // Purpose:     MDI classes
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     MDI classes
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if wxUSE_MDI
 
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if wxUSE_MDI
 

+#include "wx/mdi.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/mdi.h"

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


@@ -31,30 +32,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)

-  EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
-  EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
+    EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
+    EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)

 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)

-  EVT_SCROLL(wxMDIClientWindow::OnScroll)
+    EVT_SCROLL(wxMDIClientWindow::OnScroll)

 END_EVENT_TABLE()
 
 static const wxChar *TRACE_MDI = _T("mdi");
 
 END_EVENT_TABLE()
 
 static const wxChar *TRACE_MDI = _T("mdi");
 

-static const int IDM_WINDOWTILE  = 4001;

 static const int IDM_WINDOWTILEHOR  = 4001;
 static const int IDM_WINDOWCASCADE = 4002;
 static const int IDM_WINDOWICONS = 4003;
 static const int IDM_WINDOWNEXT = 4004;
 static const int IDM_WINDOWTILEVERT = 4005;
 static const int IDM_WINDOWTILEHOR  = 4001;
 static const int IDM_WINDOWCASCADE = 4002;
 static const int IDM_WINDOWICONS = 4003;
 static const int IDM_WINDOWNEXT = 4004;
 static const int IDM_WINDOWTILEVERT = 4005;

-static const int IDM_WINDOWPREV = 4006;
-
-// This range gives a maximum of 500 MDI children. Should be enough :-)
-static const int wxFIRST_MDI_CHILD = 4100;
-static const int wxLAST_MDI_CHILD = 4600;
-
-// Status border dimensions
-static const int wxTHICK_LINE_BORDER = 3;

 
 // ----------------------------------------------------------------------------
 // Parent frame
 
 // ----------------------------------------------------------------------------
 // Parent frame


@@ -302,7 +294,7 @@ bool wxMDIParentFrame::ShouldBeVisible() const
         if ( win->IsShown()
                 && !wxDynamicCast(win, wxMDIChildFrame)
 #if wxUSE_STATUSBAR
         if ( win->IsShown()
                 && !wxDynamicCast(win, wxMDIChildFrame)
 #if wxUSE_STATUSBAR

-                && win != GetStatusBar()
+                && win != (wxWindow*) GetStatusBar()

 #endif
                 && win != GetClientWindow() )
         {
 #endif
                 && win != GetClientWindow() )
         {


@@ -350,19 +342,19 @@ void wxMDIChildFrame::Init()
 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *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)

 {
     SetName(name);
 
 {
     SetName(name);
 

-    if ( id > -1 )
-        m_windowId = id;
-    else
+    if ( id == wxID_ANY )

         m_windowId = (int)NewControlId();
         m_windowId = (int)NewControlId();

+    else
+        m_windowId = id;

 
     if (parent)
         parent->AddChild(this);
 
     if (parent)
         parent->AddChild(this);


@@ -373,7 +365,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
     wxModelessWindows.Append(this);
 
 
     wxModelessWindows.Append(this);
 

-    return false;
+    return true;

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


@@ -492,4 +484,3 @@ void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
 }
 
 #endif // wxUSE_MDI
 }
 
 #endif // wxUSE_MDI

-