wxGetOsVersion() compilation andl inking fixes for wxMac

[wxWidgets.git] / src / mac / classic / toplevel.cpp

diff --git a/src/mac/classic/toplevel.cpp b/src/mac/classic/toplevel.cpp
index 0c051f7acc907b791477fdf91e811f05c7927c61..aa5bc6892dc62db276adbd12d5aa676d6b8fe144 100644 (file)
--- a/src/mac/classic/toplevel.cpp
+++ b/src/mac/classic/toplevel.cpp
@@ -24,9 +24,10 @@
     #pragma hdrstop
 #endif
 
+#include "wx/toplevel.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/toplevel.h"
     #include "wx/frame.h"
     #include "wx/string.h"
     #include "wx/log.h"
@@ -35,7 +36,6 @@
 
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
-#include "wx/app.h"
 #include "wx/tooltip.h"
 #include "wx/dnd.h"
 #if wxUSE_SYSTEM_OPTIONS
@@ -510,7 +510,7 @@ void wxTopLevelWindowMac::Init()
     m_macUsesCompositing = false ;
 #if TARGET_CARBON
     m_macEventHandler = NULL ;
- #endif
+#endif
 }
 
 class wxMacDeferredWindowDeleter : public wxObject
@@ -1083,7 +1083,7 @@ void wxTopLevelWindowMac::SetTitle(const wxString& title)
     UMASetWTitle( (WindowRef)m_macWindow , title , m_font.GetEncoding() ) ;
 }
 
-virtual wxString wxTopLevelWindowMac::GetTitle() const
+wxString wxTopLevelWindowMac::GetTitle() const
 {
     return wxWindow::GetLabel();
 }