X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d2791f12caee789ac732ac586588dad1fab1947..34d26f42b16d6fb233988fec2a7fa6c8f397972d:/include/wx/mac/app.h

diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h
index 8381c919d2..272f7b5ef5 100644
--- a/include/wx/mac/app.h
+++ b/include/wx/mac/app.h
@@ -51,8 +51,8 @@ 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; }
   virtual int GetPrintMode() const { return m_printMode; }
 
@@ -92,8 +92,8 @@ public:
   static long           sm_lastMessageTime;
   static wxWindow*			s_captureWindow ;
   static int						s_lastMouseDown ; // 0 = none , 1 = left , 2 = right
-  static RgnHandle			s_macCursorRgn ;
-	EventRecord*					m_macCurrentEvent ;
+  static WXHRGN			s_macCursorRgn ;
+  WXEVENTREF					m_macCurrentEvent ;
   
   int                   m_nCmdShow;
 
@@ -119,9 +119,9 @@ public :
   static bool						s_macHasDialogManager ;
   static long						s_macDialogManagerVersion ;
 
-	RgnHandle							m_macCursorRgn ;
-	RgnHandle							m_macSleepRgn ;
-	RgnHandle							m_macHelpRgn ;
+	WXHRGN							m_macCursorRgn ;
+	WXHRGN							m_macSleepRgn ;
+	WXHRGN							m_macHelpRgn ;
 	
   virtual void          MacSuspend( bool convertClipboard ) ;
   virtual void          MacResume( bool convertClipboard ) ;
@@ -132,29 +132,38 @@ public :
 	// event main methods
 
 	void									MacDoOneEvent() ;	
-	void									MacHandleOneEvent( EventRecord *ev ) ;
-	EventRecord*					MacGetCurrentEvent() { return m_macCurrentEvent ; }
+	void									MacHandleOneEvent( WXEVENTREF ev ) ;
+	WXEVENTREF					MacGetCurrentEvent() { return m_macCurrentEvent ; }
 	// primary events
 	
-  virtual void          MacHandleMouseDownEvent( EventRecord *ev ) ;
-  virtual void          MacHandleMouseUpEvent( EventRecord *ev ) ;
- 	virtual void          MacHandleActivateEvent( EventRecord *ev ) ;
-  virtual void          MacHandleUpdateEvent( EventRecord *ev ) ;
-  virtual void          MacHandleKeyDownEvent( EventRecord *ev ) ;
-  virtual void          MacHandleKeyUpEvent( EventRecord *ev ) ;
-  virtual void          MacHandleDiskEvent( EventRecord *ev ) ;
-  virtual void          MacHandleOSEvent( EventRecord *ev ) ;
-  virtual void   				MacHandleHighLevelEvent( EventRecord *ev ) ;
+  virtual void          MacHandleMouseDownEvent( WXEVENTREF ev ) ;
+  virtual void          MacHandleMouseUpEvent( WXEVENTREF ev ) ;
+ 	virtual void          MacHandleActivateEvent( WXEVENTREF ev ) ;
+  virtual void          MacHandleUpdateEvent( WXEVENTREF ev ) ;
+  virtual void          MacHandleKeyDownEvent( WXEVENTREF ev ) ;
+  virtual void          MacHandleKeyUpEvent( WXEVENTREF ev ) ;
+  virtual void          MacHandleDiskEvent( WXEVENTREF ev ) ;
+  virtual void          MacHandleOSEvent( WXEVENTREF ev ) ;
+  virtual void   				MacHandleHighLevelEvent( WXEVENTREF ev ) ;
  	virtual void					MacHandleMenuSelect( int menuid , int menuitem ) ;
 
-	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) ;
+	virtual short					MacHandleAEODoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
+	virtual short					MacHandleAEPDoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
+	virtual short					MacHandleAEOApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
+	virtual short					MacHandleAEQuit(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
 
 DECLARE_EVENT_TABLE()
 };
 
+class WXDLLEXPORT wxStAppResource
+{
+public :
+    wxStAppResource() ;
+    ~wxStAppResource() ;
+private :
+    short m_currentRefNum ;
+} ;
+
 // TODO: add platform-specific arguments
 int WXDLLEXPORT wxEntry( int argc, char *argv[] , bool enterLoop = TRUE);
 
@@ -171,17 +180,17 @@ 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 ) ;
+void wxMacStringToPascal( const char * from , unsigned char* 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 ) 
+inline void wxMacStringToPascal( const char * from , unsigned char*  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 ) ;
+wxString wxMacMakeStringFromPascal( unsigned char*  from , bool mac2pcEncoding ) ;
 
 // converts this pascal string into a wxString with pc 2 mac encoding if s_macDefaultEncodingIsPC
-inline wxString wxMacMakeStringFromPascal( StringPtr from  ) 
+inline wxString wxMacMakeStringFromPascal( unsigned char*  from  ) 
   { return wxMacMakeStringFromPascal( from , wxApp::s_macDefaultEncodingIsPC ) ; }
 
 // converts this c string into a wxString with optional mac 2 pc encoding