added wxAppTraits::SetLocale() and call it during wxApp initialization in all ports...

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

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 4778cc36686cb8df5b67fb743f0c9a90f5b13bed..842251756bbb115b65e458decc623c2a738b1ac0 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -1,7 +1,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     implements wxTopLevelWindow for Cocoa
 // Purpose:     implements wxTopLevelWindow for Cocoa

-// Author:      David Elliott 
+// Author:      David Elliott

 // Modified by:
 // Created:     2002/11/27
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     2002/11/27
 // RCS-ID:      $Id$


@@ -19,9 +19,11 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

+
+#include "wx/toplevel.h"
+

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

-    #include "wx/toplevel.h"

     #include "wx/menuitem.h"
     #include "wx/frame.h"
     #include "wx/log.h"
     #include "wx/menuitem.h"
     #include "wx/frame.h"
     #include "wx/log.h"


@@ -93,7 +95,7 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
     wxTopLevelWindows.Append(this);
 
     if(!CreateBase(parent,winid,pos,size,style,wxDefaultValidator,name))
     wxTopLevelWindows.Append(this);
 
     if(!CreateBase(parent,winid,pos,size,style,wxDefaultValidator,name))

-        return FALSE;
+        return false;

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


@@ -105,7 +107,7 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
     // Create frame and check and handle default position and size
     int realx,
         realy;
     // Create frame and check and handle default position and size
     int realx,
         realy;

-    
+

     // WX has no set default position - the carbon port caps the low
     // end at 20, 50.  Here we do the same, except instead of setting
     // it to 20 and 50, we set it to 100 and 100 if the values are too low
     // WX has no set default position - the carbon port caps the low
     // end at 20, 50.  Here we do the same, except instead of setting
     // it to 20 and 50, we set it to 100 and 100 if the values are too low


@@ -113,7 +115,7 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
         realx = 100;
     else
         realx = pos.x;
         realx = 100;
     else
         realx = pos.x;

-        
+

     if (pos.y < 50)
         realy = 100;
     else
     if (pos.y < 50)
         realy = 100;
     else


@@ -124,7 +126,7 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
 
     // NOTE: y-origin needs to be flipped.
     NSRect cocoaRect = [NSWindow
 
     // NOTE: y-origin needs to be flipped.
     NSRect cocoaRect = [NSWindow

-                        contentRectForFrameRect:NSMakeRect(realx,realy,realw,realh) 
+                        contentRectForFrameRect:NSMakeRect(realx,realy,realw,realh)

                         styleMask:cocoaStyle];
 
     m_cocoaNSWindow = NULL;
                         styleMask:cocoaStyle];
 
     m_cocoaNSWindow = NULL;


@@ -143,7 +145,7 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
     if(style & wxSTAY_ON_TOP)
         [m_cocoaNSWindow setLevel:NSFloatingWindowLevel];
     [m_cocoaNSWindow setTitle:wxNSStringWithWxString(title)];
     if(style & wxSTAY_ON_TOP)
         [m_cocoaNSWindow setLevel:NSFloatingWindowLevel];
     [m_cocoaNSWindow setTitle:wxNSStringWithWxString(title)];

-    return TRUE;
+    return true;

 }
 
 wxTopLevelWindowCocoa::~wxTopLevelWindowCocoa()
 }
 
 wxTopLevelWindowCocoa::~wxTopLevelWindowCocoa()


@@ -211,7 +213,7 @@ void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void)
 {
     DeactivatePendingWindow();
     wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey"),this);
 {
     DeactivatePendingWindow();
     wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey"),this);

-    wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
+    wxActivateEvent event(wxEVT_ACTIVATE, true, GetId());

     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
 }
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
 }


@@ -219,7 +221,7 @@ void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void)
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)
 {
     wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignKey"),this);
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)
 {
     wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignKey"),this);

-    wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId());
+    wxActivateEvent event(wxEVT_ACTIVATE, false, GetId());

     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
 }
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
 }


@@ -264,7 +266,7 @@ void wxTopLevelWindowCocoa::Maximize(bool maximize)
 
 bool wxTopLevelWindowCocoa::IsMaximized() const
 {
 
 bool wxTopLevelWindowCocoa::IsMaximized() const
 {

-    return false ; 
+    return false ;

 }
 
 void wxTopLevelWindowCocoa::Iconize(bool iconize)
 }
 
 void wxTopLevelWindowCocoa::Iconize(bool iconize)


@@ -273,7 +275,7 @@ void wxTopLevelWindowCocoa::Iconize(bool iconize)
 
 bool wxTopLevelWindowCocoa::IsIconized() const
 {
 
 bool wxTopLevelWindowCocoa::IsIconized() const
 {

-    return FALSE;
+    return false;

 }
 
 void wxTopLevelWindowCocoa::Restore()
 }
 
 void wxTopLevelWindowCocoa::Restore()


@@ -330,14 +332,25 @@ void wxTopLevelWindowCocoa::OnCloseWindow(wxCloseEvent& event)
 // wxTopLevelWindowCocoa misc
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowCocoa misc
 // ----------------------------------------------------------------------------
 

+void wxTopLevelWindowCocoa::SetTitle( const wxString& WXUNUSED(title))
+{
+    // TODO
+}
+
+wxString wxTopLevelWindowCocoa::GetTitle() const
+{
+    // TODO
+    return wxEmptyString;
+}
+

 bool wxTopLevelWindowCocoa::ShowFullScreen(bool show, long style)
 {
 bool wxTopLevelWindowCocoa::ShowFullScreen(bool show, long style)
 {

-    return FALSE;
+    return false;

 }
 
 bool wxTopLevelWindowCocoa::IsFullScreen() const
 {
 }
 
 bool wxTopLevelWindowCocoa::IsFullScreen() const
 {

-    return FALSE;
+    return false;

 }
 
 void wxTopLevelWindowCocoa::CocoaSetWxWindowSize(int width, int height)
 }
 
 void wxTopLevelWindowCocoa::CocoaSetWxWindowSize(int width, int height)


@@ -383,4 +396,3 @@ void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const
         *y=(int)cocoaRect.origin.y;
     wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,wxT("wxTopLevelWindow=%p::DoGetPosition = (%d,%d)"),this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
 }
         *y=(int)cocoaRect.origin.y;
     wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,wxT("wxTopLevelWindow=%p::DoGetPosition = (%d,%d)"),this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
 }

-