No real changes, just make wxWindow::CanScroll() virtual.

[wxWidgets.git] / src / osx / iphone / utils.mm

diff --git a/src/osx/iphone/utils.mm b/src/osx/iphone/utils.mm
index 0d27bc80a8965854c34031a4618aac57223f5086..633c7b72ac21b082ff0b976098a30855cd90925a 100644 (file)
--- a/src/osx/iphone/utils.mm
+++ b/src/osx/iphone/utils.mm
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/osx/cocoa/utils.mm
+// Name:        src/osx/iphone/utils.mm

 // Purpose:     various cocoa utility functions
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Purpose:     various cocoa utility functions
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -39,13 +38,6 @@
 
 #if 1 // wxUSE_BASE
 
 
 #if 1 // wxUSE_BASE
 

-// Emit a beeeeeep
-void wxBell()
-{
-    // would be kSystemSoundID_UserPreferredAlert but since the headers aren't correct, add it manually
-    AudioServicesPlayAlertSound(0x00001000 );
-}
-

 // ----------------------------------------------------------------------------
 // Common Event Support
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Common Event Support
 // ----------------------------------------------------------------------------


@@ -57,13 +49,21 @@ void wxBell()
 
 @implementation wxAppDelegate
 
 
 @implementation wxAppDelegate
 

+- (BOOL)application:(UIApplication *)application willFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    wxUnusedVar(application);
+    wxUnusedVar(launchOptions);
+    wxTheApp->OSXOnWillFinishLaunching();
+    return YES;
+}
+

 - (void)applicationDidFinishLaunching:(UIApplication *)application {   
 - (void)applicationDidFinishLaunching:(UIApplication *)application {   

-       wxTheApp->OnInit();
+    wxTheApp->OSXOnDidFinishLaunching();

 }
 
 - (void)applicationWillTerminate:(UIApplication *)application { 
 }
 
 - (void)applicationWillTerminate:(UIApplication *)application { 

-    wxCloseEvent event;
-    wxTheApp->OnEndSession(event);
+    wxUnusedVar(application);
+    wxTheApp->OSXOnWillTerminate();

 }
 
 - (void)dealloc {
 }
 
 - (void)dealloc {


@@ -91,6 +91,13 @@ void wxApp::DoCleanUp()
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

+// Emit a beeeeeep
+void wxBell()
+{
+    // would be kSystemSoundID_UserPreferredAlert but since the headers aren't correct, add it manually
+    AudioServicesPlayAlertSound(0x00001000 );
+}
+

 // ----------------------------------------------------------------------------
 // Launch default browser
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Launch default browser
 // ----------------------------------------------------------------------------


@@ -118,6 +125,11 @@ extern UIFont* CreateUIFont( const wxFont& font )
     return [UIFont fontWithName:wxCFStringRef(font.GetFaceName() ).AsNSString() size:font.GetPointSize()];
 }
 
     return [UIFont fontWithName:wxCFStringRef(font.GetFaceName() ).AsNSString() size:font.GetPointSize()];
 }
 

+CFArrayRef CopyAvailableFontFamilyNames()
+{
+    return (CFArrayRef) [[UIFont familyNames] retain];
+}
+

 extern void DrawTextInContext( CGContextRef context, CGPoint where, UIFont *font, NSString* text )
 {
     bool contextChanged = ( UIGraphicsGetCurrentContext() != context );
 extern void DrawTextInContext( CGContextRef context, CGPoint where, UIFont *font, NSString* text )
 {
     bool contextChanged = ( UIGraphicsGetCurrentContext() != context );