don't skip the scroll position validity check in CalcScrollInc() if m_[xy]ScrollPixel...

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

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 97f32f83877ee074cf195c9f13cc2fad651144d2..1a5379ff5290992be112e8699a304870384b545e 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -19,9 +19,11 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
+
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
     #include "wx/window.h"
-    #include "wx/toplevel.h"
     #include "wx/menuitem.h"
     #include "wx/frame.h"
     #include "wx/log.h"
@@ -330,15 +332,14 @@ void wxTopLevelWindowCocoa::OnCloseWindow(wxCloseEvent& event)
 // wxTopLevelWindowCocoa misc
 // ----------------------------------------------------------------------------
 
-void wxTopLevelWindowCocoa::SetTitle( const wxString& WXUNUSED(title))
+void wxTopLevelWindowCocoa::SetTitle(const wxString& title)
 {
-    // TODO
+    [m_cocoaNSWindow setTitle:wxNSStringWithWxString(title)];
 }
 
 wxString wxTopLevelWindowCocoa::GetTitle() const
 {
-    // TODO
-    return wxEmptyString;
+    return wxStringWithNSString([m_cocoaNSWindow title]);
 }
 
 bool wxTopLevelWindowCocoa::ShowFullScreen(bool show, long style)