Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h
index 5145328d2749299fff7b64d85af44a2cbce3be9d..5e79828ca2831bdb02d02d7eed5ee44b66dab600 100644 (file)
--- a/include/wx/osx/app.h
+++ b/include/wx/osx/app.h
@@ -83,14 +83,21 @@ public:
     // TODO change semantics to be in line with cocoa (make autrelease NOT increase the count)
     void                  MacAddToAutorelease( void* cfrefobj );
     void                  MacReleaseAutoreleasePool();
     // TODO change semantics to be in line with cocoa (make autrelease NOT increase the count)
     void                  MacAddToAutorelease( void* cfrefobj );
     void                  MacReleaseAutoreleasePool();

+    

 public:
     static wxWindow*      s_captureWindow ;
     static long           s_lastModifiers ;
 
     int                   m_nCmdShow;
 
 public:
     static wxWindow*      s_captureWindow ;
     static long           s_lastModifiers ;
 
     int                   m_nCmdShow;
 

-private:

     // mac specifics
     // mac specifics

+protected:
+#if wxOSX_USE_COCOA
+    // override for support of custom app controllers
+    virtual WX_NSObject   OSXCreateAppController();
+#endif
+    
+private:

     virtual bool        DoInitGui();
     virtual void        DoCleanUp();
 
     virtual bool        DoInitGui();
     virtual void        DoCleanUp();