Allow an app to call SetFont on a PS DC without assertion

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

diff --git a/include/wx/mac/app.h b/include/wx/mac/app.h
index fc560f15614fd834402cf133ad1d1eec870b2ceb..efc50cbea21ff37ab39ca3be76f3a670055eb812 100644 (file)
--- a/include/wx/mac/app.h
+++ b/include/wx/mac/app.h
@@ -49,9 +49,8 @@ class WXDLLEXPORT wxApp: public wxAppBase
 
     virtual int MainLoop();
     virtual void ExitMainLoop();
-    virtual bool Initialized();
     virtual bool Pending() ;
-    virtual void Dispatch() ;
+    virtual bool Dispatch() ;
 
     virtual void Exit();
 
@@ -81,6 +80,7 @@ protected:
                                        // where overriden
 public:
 
+    static bool           sm_isEmbedded;
     // Implementation
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
@@ -143,6 +143,10 @@ public:
     void                  MacDoOneEvent() ;
     WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }
     void                  MacHandleOneEvent( WXEVENTREF ev ) ;
+
+    // For embedded use. By default does nothing.
+    virtual void          MacHandleUnhandledEvent( WXEVENTREF ev );
+
 #if !TARGET_CARBON
     virtual void          MacHandleMenuSelect( int menuid , int menuitem ) ;
     virtual void          MacHandleMouseUpEvent( WXEVENTREF ev ) ;
@@ -170,6 +174,7 @@ public:
     virtual short         MacHandleAEPDoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
     virtual short         MacHandleAEOApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
     virtual short         MacHandleAEQuit(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
+    virtual short         MacHandleAERApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
 
     // in response of an open-document apple event
     virtual void         MacOpenFile(const wxString &fileName) ;
@@ -177,6 +182,8 @@ public:
     virtual void         MacPrintFile(const wxString &fileName) ;
     // in response of a open-application apple event
     virtual void         MacNewFile() ;
+    // in response of a reopen-application apple event
+    virtual void         MacReopenApp() ;
 
     DECLARE_EVENT_TABLE()
 };