deTABbed wxQsort()

[wxWidgets.git] / src / cocoa / mdi.mm

diff --git a/src/cocoa/mdi.mm b/src/cocoa/mdi.mm
index da1375de1ebecf1ba3c91d33b46d894fdb6ecabd..63e1bfd0e000586acbd001d20db58d9f439af1b3 100644 (file)
--- a/src/cocoa/mdi.mm
+++ b/src/cocoa/mdi.mm
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/mdi.mm
+// Name:        src/cocoa/mdi.mm

 // Purpose:     wxMDIParentFrame, wxMDIChildFrame, wxMDIClientWindow
 // Author:      David Elliott
 // Modified by:
 // Purpose:     wxMDIParentFrame, wxMDIChildFrame, wxMDIClientWindow
 // Author:      David Elliott
 // Modified by:


@@ -10,9 +10,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#if wxUSE_MDI
+
+#include "wx/mdi.h"
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"

-    #include "wx/mdi.h"

 #endif // WX_PRECOMP
 
 // #include "wx/cocoa/autorelease.h"
 #endif // WX_PRECOMP
 
 // #include "wx/cocoa/autorelease.h"


@@ -228,10 +232,10 @@ void wxMDIParentFrame::WindowDidBecomeMain(NSNotification *notification)
         }
         if(!hashmap.empty())
         {
         }
         if(!hashmap.empty())
         {

-            int windowCount = 0;
+            NSInteger windowCount = 0;

             NSCountWindows(&windowCount);
             wxASSERT(windowCount>0);
             NSCountWindows(&windowCount);
             wxASSERT(windowCount>0);

-            int *windowList = new int[windowCount];
+            NSInteger *windowList = new NSInteger[windowCount];

             NSWindowList(windowCount, windowList);
             wxIntMDIChildFrameHashMap::iterator iter = hashmap.end();
             for(int i=0; i<windowCount && iter == hashmap.end(); i++)
             NSWindowList(windowCount, windowList);
             wxIntMDIChildFrameHashMap::iterator iter = hashmap.end();
             for(int i=0; i<windowCount && iter == hashmap.end(); i++)


@@ -320,7 +324,7 @@ wxMDIClientWindow::wxMDIClientWindow()
 }
 
 wxMDIClientWindow::wxMDIClientWindow(wxMDIParentFrame *parent, long style)
 }
 
 wxMDIClientWindow::wxMDIClientWindow(wxMDIParentFrame *parent, long style)

-:   wxWindow(parent, -1)
+                  :wxWindow(parent, wxID_ANY)

 {
 }
 
 {
 }
 


@@ -333,3 +337,4 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style)
     return false;
 }
 
     return false;
 }
 

+#endif