Base wxArchiveFSHandler on wxZipFSHandler.

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

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 5653b011b704c18321642175ea6a3fa7d7fac76c..74ea906beb54c9d84009311fef46c5c225739929 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -4,17 +4,20 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/26
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/26

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2002 David Elliott
 // Copyright:   (c) 2002 David Elliott

-// Licence:    wxWidgets licence
+// Licence:     wxWidgets licence

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

+

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

+    #include "wx/utils.h"

 #endif //WX_PRECOMP
 #endif //WX_PRECOMP

+

 #include "wx/tooltip.h"
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/tooltip.h"
 
 #include "wx/cocoa/autorelease.h"


@@ -308,8 +311,8 @@ void wxWindowCocoa::Init()
     m_cocoaNSView = NULL;
     m_cocoaHider = NULL;
     m_wxCocoaScrollView = NULL;
     m_cocoaNSView = NULL;
     m_cocoaHider = NULL;
     m_wxCocoaScrollView = NULL;

-    m_isBeingDeleted = FALSE;
-    m_isInPaint = FALSE;
+    m_isBeingDeleted = false;
+    m_isInPaint = false;

     m_shouldBeEnabled = true;
 }
 
     m_shouldBeEnabled = true;
 }
 


@@ -335,7 +338,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID winid,
         SetInitialFrameRect(pos,size);
     }
 
         SetInitialFrameRect(pos,size);
     }
 

-    return TRUE;
+    return true;

 }
 
 // Destructor
 }
 
 // Destructor


@@ -439,7 +442,7 @@ bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
         wxLogDebug(wxT("Paint event recursion!"));
         return false;
     }
         wxLogDebug(wxT("Paint event recursion!"));
         return false;
     }

-    m_isInPaint = TRUE;
+    m_isInPaint = true;

 
     // Set m_updateRegion
     const NSRect *rects = ▭ // The bounding box of the region
 
     // Set m_updateRegion
     const NSRect *rects = ▭ // The bounding box of the region


@@ -459,7 +462,7 @@ bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
     bool ret = GetEventHandler()->ProcessEvent(event);
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
     bool ret = GetEventHandler()->ProcessEvent(event);

-    m_isInPaint = FALSE;
+    m_isInPaint = false;

     return ret;
 }
 
     return ret;
 }
 


@@ -580,9 +583,9 @@ bool wxWindowCocoa::Cocoa_resetCursorRects()
 {
     if(!m_cursor.GetNSCursor())
         return false;
 {
     if(!m_cursor.GetNSCursor())
         return false;

-    
-    [GetNSView() addCursorRect: [GetNSView() visibleRect]  cursor: m_cursor.GetNSCursor()];    
-        
+
+    [GetNSView() addCursorRect: [GetNSView() visibleRect]  cursor: m_cursor.GetNSCursor()];
+

     return true;
 }
 
     return true;
 }
 


@@ -679,7 +682,7 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags
 
     AdjustForParentClientOrigin(x,y,sizeFlags);
 
 
     AdjustForParentClientOrigin(x,y,sizeFlags);
 

-    wxSize size(-1,-1);
+    wxSize size(wxDefaultSize);

 
     if((width==-1)&&!(sizeFlags&wxSIZE_ALLOW_MINUS_ONE))
     {
 
     if((width==-1)&&!(sizeFlags&wxSIZE_ALLOW_MINUS_ONE))
     {


@@ -849,7 +852,18 @@ void wxWindow::DoSetClientSize(int width, int height)
 
 void wxWindow::CocoaSetWxWindowSize(int width, int height)
 {
 
 void wxWindow::CocoaSetWxWindowSize(int width, int height)
 {

-    wxWindowCocoa::DoSetSize(-1,-1,width,height,wxSIZE_USE_EXISTING);
+    wxWindowCocoa::DoSetSize(wxDefaultCoord,wxDefaultCoord,width,height,wxSIZE_USE_EXISTING);
+}
+
+void wxWindow::SetLabel(const wxString& WXUNUSED(label))
+{
+    // TODO
+}
+
+wxString wxWindow::GetLabel() const
+{
+    // TODO
+    return wxEmptyString;

 }
 
 int wxWindow::GetCharHeight() const
 }
 
 int wxWindow::GetCharHeight() const


@@ -933,7 +947,7 @@ void wxWindow::DoSetVirtualSize( int x, int y )
 bool wxWindow::SetFont(const wxFont& font)
 {
     // TODO
 bool wxWindow::SetFont(const wxFont& font)
 {
     // TODO

-    return TRUE;
+    return true;

 }
 
 static int CocoaRaiseWindowCompareFunction(id first, id second, void *target)
 }
 
 static int CocoaRaiseWindowCompareFunction(id first, id second, void *target)


@@ -979,7 +993,7 @@ void wxWindow::Lower()
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {

-    return FALSE;
+    return false;

 }
 
 // Get the window with the focus
 }
 
 // Get the window with the focus


@@ -997,14 +1011,14 @@ wxWindow *wxWindowBase::DoFindFocus()
     wxCocoaNSView *win;
 
     NSWindow *keyWindow = [[NSApplication sharedApplication] keyWindow];
     wxCocoaNSView *win;
 
     NSWindow *keyWindow = [[NSApplication sharedApplication] keyWindow];

-    win = wxCocoaNSView::GetFromCocoa([keyWindow firstResponder]);
+    win = wxCocoaNSView::GetFromCocoa(static_cast<NSView*>([keyWindow firstResponder]));

     if(win)
         return win->GetWxWindow();
 
     NSWindow *mainWindow = [[NSApplication sharedApplication] keyWindow];
     if(mainWindow == keyWindow)
         return NULL;
     if(win)
         return win->GetWxWindow();
 
     NSWindow *mainWindow = [[NSApplication sharedApplication] keyWindow];
     if(mainWindow == keyWindow)
         return NULL;

-    win = wxCocoaNSView::GetFromCocoa([mainWindow firstResponder]);
+    win = wxCocoaNSView::GetFromCocoa(static_cast<NSView*>([mainWindow firstResponder]));

     if(win)
         return win->GetWxWindow();
 
     if(win)
         return win->GetWxWindow();
 


@@ -1029,9 +1043,15 @@ wxPoint wxGetMousePosition()
     return wxDefaultPosition;
 }
 
     return wxDefaultPosition;
 }
 

+wxMouseState wxGetMouseState()
+{
+    wxMouseState ms;
+    // TODO
+    return ms;
+}
+

 wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 {
     pt = wxGetMousePosition();
     return NULL;
 }
 wxWindow* wxFindWindowAtPointer(wxPoint& pt)
 {
     pt = wxGetMousePosition();
     return NULL;
 }

-