Move src/cocoa/utils.cpp to src/cocoa/utils.mm.

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

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 74ea906beb54c9d84009311fef46c5c225739929..6529cdf7be8fbab8127667a9462d33e9ff924128 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -23,7 +23,7 @@
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
 
-#import <AppKit/NSView.h>
+#include "wx/cocoa/objc/NSView.h"
 #import <AppKit/NSEvent.h>
 #import <AppKit/NSScrollView.h>
 #import <AppKit/NSColor.h>
@@ -313,7 +313,6 @@ void wxWindowCocoa::Init()
     m_wxCocoaScrollView = NULL;
     m_isBeingDeleted = false;
     m_isInPaint = false;
-    m_shouldBeEnabled = true;
 }
 
 // Constructor
@@ -328,7 +327,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID winid,
 
     // TODO: create the window
     m_cocoaNSView = NULL;
-    SetNSView([[NSView alloc] initWithFrame: MakeDefaultNSRect(size)]);
+    SetNSView([[WXNSView alloc] initWithFrame: MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
 
     if (m_parent)
@@ -601,32 +600,9 @@ void wxWindow::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
     [[oldView superview] replaceSubview:oldView with:newView];
 }
 
-bool wxWindow::EnableSelfAndChildren(bool enable)
+void wxWindow::DoEnable(bool enable)
 {
-    // If the state isn't changing, don't do anything
-    if(!wxWindowBase::Enable(enable && m_shouldBeEnabled))
-        return false;
-    // Set the state of the Cocoa window
-    CocoaSetEnabled(m_isEnabled);
-    // Disable all children or (if enabling) return them to their proper state
-    for(wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-        node; node = node->GetNext())
-    {
-        node->GetData()->EnableSelfAndChildren(enable);
-    }
-    return true;
-}
-
-bool wxWindow::Enable(bool enable)
-{
-    // Keep track of what the window SHOULD be doing
-    m_shouldBeEnabled = enable;
-    // If the parent is disabled for any reason, then this window will be too.
-    if(!IsTopLevel() && GetParent())
-    {
-        enable = enable && GetParent()->IsEnabled();
-    }
-    return EnableSelfAndChildren(enable);
+       CocoaSetEnabled(enable);
 }
 
 bool wxWindow::Show(bool show)
@@ -857,12 +833,13 @@ void wxWindow::CocoaSetWxWindowSize(int width, int height)
 
 void wxWindow::SetLabel(const wxString& WXUNUSED(label))
 {
-    // TODO
+    // Intentional no-op.
 }
 
 wxString wxWindow::GetLabel() const
 {
-    // TODO
+    // General Get/Set of labels is implemented in wxControlBase
+    wxLogDebug(wxT("wxWindow::GetLabel: Should be overridden if needed."));
     return wxEmptyString;
 }