we no longer need wxFrameNative

[wxWidgets.git] / include / wx / mac / app.h

diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h
index 145c0232749ccd7b84388b281c56d186e9f8f572..50c0d60f835e1d42bba677b6f7524dbe0638779f 100644 (file)
--- a/include/wx/mac/app.h
+++ b/include/wx/mac/app.h
@@ -22,7 +22,7 @@
 #include "wx/event.h"
 
 class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxWindowMac;
 class WXDLLEXPORT wxApp ;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
@@ -51,6 +51,7 @@ class WXDLLEXPORT wxApp: public wxAppBase
   virtual bool Initialized();
   virtual bool Pending() ;
   virtual void Dispatch() ;
+  virtual bool Yield(bool onlyIfNeeded = FALSE);
 
   virtual wxIcon GetStdIcon(int which) const;
   virtual void SetPrintMode(int mode) { m_printMode = mode; }
@@ -67,7 +68,7 @@ class WXDLLEXPORT wxApp: public wxAppBase
 
   // Send idle event to window and all subwindows
   // Returns TRUE if more idle time is requested.
-  bool SendIdleEvents(wxWindow* win);
+  bool SendIdleEvents(wxWindowMac* win);
 
   // Windows only, but for compatibility...
   inline void SetAuto3D(bool flag) { m_auto3D = flag; }
@@ -147,10 +148,10 @@ public :
   virtual void                                 MacHandleHighLevelEvent( EventRecord *ev ) ;
        virtual void                                    MacHandleMenuSelect( int menuid , int menuitem ) ;
 
-       virtual OSErr                                   MacHandleAEODoc(AppleEvent *event , AppleEvent *reply) ;
-       virtual OSErr                                   MacHandleAEPDoc(AppleEvent *event , AppleEvent *reply) ;
-       virtual OSErr                                   MacHandleAEOApp(AppleEvent *event , AppleEvent *reply) ;
-       virtual OSErr                                   MacHandleAEQuit(AppleEvent *event , AppleEvent *reply) ;
+       virtual OSErr                                   MacHandleAEODoc(const AppleEvent *event , AppleEvent *reply) ;
+       virtual OSErr                                   MacHandleAEPDoc(const AppleEvent *event , AppleEvent *reply) ;
+       virtual OSErr                                   MacHandleAEOApp(const AppleEvent *event , AppleEvent *reply) ;
+       virtual OSErr                                   MacHandleAEQuit(const AppleEvent *event , AppleEvent *reply) ;
 
 DECLARE_EVENT_TABLE()
 };
@@ -170,6 +171,27 @@ void wxMacConvertToPC( char * p ) ;
 void wxMacConvertToPC( unsigned char *p ) ;
 wxString wxMacMakePCStringFromMac( const char * p ) ;
 
+// converts this string into a pascal with optional pc 2 mac encoding
+void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding ) ;
+
+// converts this string into a pascal with pc 2 mac encoding if s_macDefaultEncodingIsPC
+inline void wxMacStringToPascal( const char * from , StringPtr to ) 
+  { wxMacStringToPascal( from , to , wxApp::s_macDefaultEncodingIsPC ) ; }
+
+// converts this string into a pascal with optional mac 2 pc encoding
+wxString wxMacMakeStringFromPascal( StringPtr from , bool mac2pcEncoding ) ;
+
+// converts this pascal string into a wxString with pc 2 mac encoding if s_macDefaultEncodingIsPC
+inline wxString wxMacMakeStringFromPascal( StringPtr from  ) 
+  { return wxMacMakeStringFromPascal( from , wxApp::s_macDefaultEncodingIsPC ) ; }
+
+// converts this c string into a wxString with optional mac 2 pc encoding
+wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) ;
+
+// converts this c string into a wxString with pc 2 mac encoding if s_macDefaultEncodingIsPC
+inline wxString wxMacMakeStringFromMacString( const char* from  ) 
+  { return wxMacMakeStringFromMacString( from , wxApp::s_macDefaultEncodingIsPC ) ; }
+
 #endif
     // _WX_APP_H_