First actual sorting for wxDataViewCtrl

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

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index c6bbd3831988250178c5a74b38c1e876c5c49c49..83dd00623d1cc066665c0a69cb0063b0c3af6bb2 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -33,9 +33,10 @@
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
 

-#import <AppKit/NSView.h>
-#import <AppKit/NSWindow.h>
+#include "wx/cocoa/objc/NSView.h"
+#include "wx/cocoa/objc/NSWindow.h"

 #import <AppKit/NSPanel.h>
 #import <AppKit/NSPanel.h>

+

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------


@@ -131,10 +132,18 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
 
     m_cocoaNSWindow = NULL;
     m_cocoaNSView = NULL;
 
     m_cocoaNSWindow = NULL;
     m_cocoaNSView = NULL;

+    // NOTE: We may need to deal with the contentView becoming a wx NSView as well.
+    NSWindow *newWindow;
+    // Create a WXNSPanel or a WXNSWindow depending on what type of window is desired.

     if(style & wxFRAME_TOOL_WINDOW)
     if(style & wxFRAME_TOOL_WINDOW)

-        SetNSWindow([[NSPanel alloc] initWithContentRect:cocoaRect styleMask:cocoaStyle backing:NSBackingStoreBuffered defer:NO]);
+        newWindow = [[WXNSPanel alloc] initWithContentRect:cocoaRect styleMask:cocoaStyle backing:NSBackingStoreBuffered defer:NO];

     else
     else

-        SetNSWindow([[NSWindow alloc] initWithContentRect:cocoaRect styleMask:cocoaStyle backing:NSBackingStoreBuffered defer:NO]);
+        newWindow = [[WXNSWindow alloc] initWithContentRect:cocoaRect styleMask:cocoaStyle backing:NSBackingStoreBuffered defer:NO];
+    // Make sure the default content view is a WXNSView
+    [newWindow setContentView: [[WX_GET_OBJC_CLASS(WXNSView) alloc] initWithFrame: [[newWindow contentView] frame]]];
+    // Associate the window and view
+    SetNSWindow(newWindow);
+

     // NOTE: SetNSWindow has retained the Cocoa object for this object.
     // Because we do not release on close, the following release matches the
     // above alloc and thus the retain count will be 1.
     // NOTE: SetNSWindow has retained the Cocoa object for this object.
     // Because we do not release on close, the following release matches the
     // above alloc and thus the retain count will be 1.


@@ -144,7 +153,7 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
         [m_cocoaNSWindow setExcludedFromWindowsMenu: YES];
     if(style & wxSTAY_ON_TOP)
         [m_cocoaNSWindow setLevel:NSFloatingWindowLevel];
         [m_cocoaNSWindow setExcludedFromWindowsMenu: YES];
     if(style & wxSTAY_ON_TOP)
         [m_cocoaNSWindow setLevel:NSFloatingWindowLevel];

-    SetTitle(title);
+    [m_cocoaNSWindow setTitle:wxNSStringWithWxString(title)];

     return true;
 }
 
     return true;
 }
 


@@ -188,6 +197,8 @@ void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow)
     [cocoaNSWindow retain];
     [m_cocoaNSWindow release];
     m_cocoaNSWindow = cocoaNSWindow;
     [cocoaNSWindow retain];
     [m_cocoaNSWindow release];
     m_cocoaNSWindow = cocoaNSWindow;

+    // NOTE: We are no longer using posing so we won't get events on the
+    // window's view unless it was explicitly created as the wx view class.

     if(m_cocoaNSWindow)
         SetNSView([m_cocoaNSWindow contentView]);
     else
     if(m_cocoaNSWindow)
         SetNSView([m_cocoaNSWindow contentView]);
     else


@@ -332,7 +343,7 @@ void wxTopLevelWindowCocoa::OnCloseWindow(wxCloseEvent& event)
 // wxTopLevelWindowCocoa misc
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowCocoa misc
 // ----------------------------------------------------------------------------
 

-void wxTopLevelWindowCocoa::SetTitle( const wxString& WXUNUSED(title))
+void wxTopLevelWindowCocoa::SetTitle(const wxString& title)

 {
     [m_cocoaNSWindow setTitle:wxNSStringWithWxString(title)];
 }
 {
     [m_cocoaNSWindow setTitle:wxNSStringWithWxString(title)];
 }