added Mac OS X application bundle (framework) building

[wxWidgets.git] / src / mac / carbon / app.cpp

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 8f08a5d67cab7181997d0a397a160fc64f8e2685..8cd0fbe281b0ece16e7df2364842401eb6ba13ed 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -373,6 +373,12 @@ void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding
       CopyCStringToPascal( from , to ) ;
     }
 }
       CopyCStringToPascal( from , to ) ;
     }
 }

+#ifdef WXMAKINGDLL
+#ifndef __DARWIN__
+// we know it's there ;-)
+WXIMPORT char std::__throws_bad_alloc ;
+#endif
+#endif

 
 bool wxApp::Initialize()
 {
 
 bool wxApp::Initialize()
 {


@@ -448,6 +454,7 @@ bool wxApp::Initialize()
 
   if ( error )
   {
 
   if ( error )
   {

+        wxStAppResource resload ;

         short itemHit;
         Str255 message;
 
         short itemHit;
         Str255 message;
 


@@ -503,6 +510,9 @@ bool wxApp::Initialize()
 #endif // wxUSE_LOG
 #endif
 
 #endif // wxUSE_LOG
 #endif
 

+  wxWinMacWindowList = new wxList(wxKEY_INTEGER);
+  wxWinMacControlList = new wxList(wxKEY_INTEGER);
+

   wxInitializeStockLists();
   wxInitializeStockObjects();
 
   wxInitializeStockLists();
   wxInitializeStockObjects();
 


@@ -517,9 +527,6 @@ bool wxApp::Initialize()
      return FALSE;
   }
 
      return FALSE;
   }
 

-  wxWinMacWindowList = new wxList(wxKEY_INTEGER);
-  wxWinMacControlList = new wxList(wxKEY_INTEGER);
-

   wxMacCreateNotifierTable() ;
 
   UMAShowArrowCursor() ;
   wxMacCreateNotifierTable() ;
 
   UMAShowArrowCursor() ;


@@ -621,19 +628,76 @@ void wxApp::CleanUp()
 // wxEntry
 //----------------------------------------------------------------------
 
 // wxEntry
 //----------------------------------------------------------------------
 

-int wxEntryStart( int argc, char *argv[] )
+short gCurrentResource = -1 ;
+
+wxStAppResource::wxStAppResource()
+{
+    m_currentRefNum = CurResFile() ;
+    if ( gCurrentResource != -1 )
+    {
+        UseResFile( gCurrentResource ) ;
+    }
+}
+
+wxStAppResource::~wxStAppResource()
+{
+    if ( m_currentRefNum != -1 )
+    {
+        UseResFile( m_currentRefNum ) ;
+    }
+}
+
+#ifdef WXMAKINGDLL
+
+// for shared libraries we have to manually get the correct resource ref num upon
+// initializing and releasing when terminating, therefore the __wxinitialize and __wxterminate
+// must be used
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void __sinit(void);    /*      (generated by linker)   */
+pascal OSErr __initialize(const CFragInitBlock *theInitBlock);
+pascal void __terminate(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock)
+{
+   gCurrentResource = -1;
+   
+   if (theInitBlock->fragLocator.where == kDataForkCFragLocator) {
+      gCurrentResource = 
+         FSpOpenResFile(theInitBlock->fragLocator.u.onDisk.fileSpec, 
+                              fsRdPerm);
+   }
+   return __initialize( theInitBlock ) ;
+}
+
+pascal void __wxterminate(void)
+{
+    if (gCurrentResource != -1)
+      CloseResFile(gCurrentResource);
+    __terminate() ;
+}
+#endif
+
+int WXDLLEXPORT wxEntryStart( int argc, char *argv[] )

 {
     return wxApp::Initialize();
 }
 
 
 {
     return wxApp::Initialize();
 }
 
 

-int wxEntryInitGui()
+int WXDLLEXPORT wxEntryInitGui()

 {
     return wxTheApp->OnInitGui();
 }
 
 
 {
     return wxTheApp->OnInitGui();
 }
 
 

-void wxEntryCleanup()
+void WXDLLEXPORT wxEntryCleanup()

 {
     wxApp::CleanUp();
 }
 {
     wxApp::CleanUp();
 }


@@ -641,6 +705,7 @@ void wxEntryCleanup()
 
 int wxEntry( int argc, char *argv[] , bool enterLoop )
 {
 
 int wxEntry( int argc, char *argv[] , bool enterLoop )
 {

+    gCurrentResource = CurResFile() ;

 #ifdef __MWERKS__
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     // This seems to be necessary since there are 'rogue'
 #ifdef __MWERKS__
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     // This seems to be necessary since there are 'rogue'