* Fix logical error in m_overflow attribute merging

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index bf3a261a93c62683c8606e50303a1a02a66a3648..f3ef2825300e818af12e51d4cc7a729c341fdcf6 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -219,7 +219,7 @@ short wxApp::MacHandleAEOApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU
     return noErr ;
 }
 
     return noErr ;
 }
 

-// AEQuit attempts to quite the application
+// AEQuit attempts to quit the application

 
 short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {
 
 short wxApp::MacHandleAEQuit(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNUSED(reply))
 {


@@ -303,10 +303,7 @@ void wxApp::MacNewFile()
 
 static pascal OSStatus MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
 
 static pascal OSStatus MenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {

-    OSStatus result = eventNotHandledErr ;
-    UInt32 kind = GetEventKind( event ) ;
-
-    return result ;
+    return eventNotHandledErr ;

 }
 
 // due to the rather low-level event API of wxWindows, we cannot use RunApplicationEventLoop
 }
 
 // due to the rather low-level event API of wxWindows, we cannot use RunApplicationEventLoop


@@ -553,37 +550,24 @@ bool wxApp::Initialize()
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
     wxTheColourDatabase->Initialize();
 
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
     wxTheColourDatabase->Initialize();
 

-#ifdef __WXDEBUG__
-#if wxUSE_LOG
-    // flush the logged messages if any and install a 'safer' log target: the
-    // default one (wxLogGui) can't be used after the resources are freed just
-    // below and the user suppliedo ne might be even more unsafe (using any
-    // wxWindows GUI function is unsafe starting from now)
-    wxLog::DontCreateOnDemand();
-
-    // this will flush the old messages if any
-    delete wxLog::SetActiveTarget(new wxLogStderr);
-#endif // wxUSE_LOG
-#endif
-
-  wxWinMacWindowList = new wxList(wxKEY_INTEGER);
-  wxWinMacControlList = new wxList(wxKEY_INTEGER);
+    wxWinMacWindowList = new wxList(wxKEY_INTEGER);
+    wxWinMacControlList = new wxList(wxKEY_INTEGER);

 
 

-  wxInitializeStockLists();
-  wxInitializeStockObjects();
+    wxInitializeStockLists();
+    wxInitializeStockObjects();

 
 

-  wxBitmap::InitStandardHandlers();
+    wxBitmap::InitStandardHandlers();

 
 

-  wxModule::RegisterModules();
-  if (!wxModule::InitializeModules()) {
-     return FALSE;
-  }
+    wxModule::RegisterModules();
+    if (!wxModule::InitializeModules()) {
+        return FALSE;
+    }

 
 

-  wxMacCreateNotifierTable() ;
+    wxMacCreateNotifierTable() ;

 
 

-  UMAShowArrowCursor() ;
+    UMAShowArrowCursor() ;

 
 

-  return TRUE;
+    return TRUE;

 }
 
 bool wxApp::OnInitGui()
 }
 
 bool wxApp::OnInitGui()


@@ -667,9 +651,12 @@ void wxApp::CleanUp()
         delete wxWinMacControlList ;
     }
     delete wxPendingEvents;
         delete wxWinMacControlList ;
     }
     delete wxPendingEvents;

+    wxPendingEvents = NULL;

 
 #if wxUSE_THREADS
     delete wxPendingEventsLocker;
 
 #if wxUSE_THREADS
     delete wxPendingEventsLocker;

+    // There is still more cleanup code that will try to use this if not NULL.
+    wxPendingEventsLocker = NULL;

     // If we don't do the following, we get an apparent memory leak.
     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
 #endif
     // If we don't do the following, we get an apparent memory leak.
     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
 #endif


@@ -799,8 +786,15 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
             theModule = NSModuleForSymbol(theSymbol);
             theLibPath = NSLibraryNameForModule(theModule);
 
             theModule = NSModuleForSymbol(theSymbol);
             theLibPath = NSLibraryNameForModule(theModule);
 

+            // if we call wxLogDebug from here then, as wxTheApp hasn't been
+            // created yet when we're called from wxApp::Initialize(), wxLog
+            // is going to create a default stderr-based log target instead of
+            // the expected normal GUI one -- don't do it, if we really want
+            // to see this message just use fprintf() here
+#if 0

             wxLogDebug( wxT("wxMac library installation name is '%s'"),
                         theLibPath );
             wxLogDebug( wxT("wxMac library installation name is '%s'"),
                         theLibPath );

+#endif

 
             // allocate copy to replace .dylib.* extension with .rsrc
             theResPath = strdup(theLibPath);
 
             // allocate copy to replace .dylib.* extension with .rsrc
             theResPath = strdup(theLibPath);


@@ -815,8 +809,10 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
                 // overwrite extension with ".rsrc"
                 strcpy(theExt, ".rsrc");
 
                 // overwrite extension with ".rsrc"
                 strcpy(theExt, ".rsrc");
 

+#if 0

                 wxLogDebug( wxT("wxMac resources file name is '%s'"),
                             theResPath );
                 wxLogDebug( wxT("wxMac resources file name is '%s'"),
                             theResPath );

+#endif

 
                 theErr = FSPathMakeRef((UInt8 *) theResPath, &theResRef, false);
                 if (theErr != noErr) {
 
                 theErr = FSPathMakeRef((UInt8 *) theResPath, &theResRef, false);
                 if (theErr != noErr) {


@@ -830,8 +826,11 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
                                                  &gSharedLibraryResource);
                 }
                 if (theErr != noErr) {
                                                  &gSharedLibraryResource);
                 }
                 if (theErr != noErr) {

-                    wxLogDebug( wxT("unable to open wxMac resource file '%s'"),
-                                theResPath );
+#ifdef __WXDEBUG__
+                    fprintf(stderr,
+                            wxT("unable to open wxMac resource file '%s'\n"),
+                            theResPath );
+#endif // __WXDEBUG__

                 }
 
                 // free duplicated resource file path
                 }
 
                 // free duplicated resource file path


@@ -1400,7 +1399,8 @@ void wxApp::MacSuspend( bool convertClipboard )
     while (node)
     {
         wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();
     while (node)
     {
         wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();

-        win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ;
+        if (!win->HasFlag(wxSTAY_ON_TOP))
+            win->MacActivate( ((EventRecord*) MacGetCurrentEvent())->when , false ) ;

 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }


@@ -2348,21 +2348,13 @@ void wxApp::MacHandleOSEvent( WXEVENTREF evr )
 
 void wxApp::MacHandleMenuCommand( wxUint32 id )
 {
 
 void wxApp::MacHandleMenuCommand( wxUint32 id )
 {

-        wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
-        wxMenu* menu = NULL ;
-        wxMenuItem* item = NULL ;
-        if ( mbar )
-        {
-            item = mbar->FindItem( id , &menu ) ;
-        }
-        wxCHECK_RET( item != NULL && menu != NULL && mbar != NULL, wxT("error in menu item callback") );
-
-        if (item->IsCheckable())
-        {
-            item->Check( !item->IsChecked() ) ;
-        }
-
-        menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
+    wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
+    wxFrame* frame = mbar->GetFrame();
+    wxCHECK_RET( mbar != NULL && frame != NULL, wxT("error in menu item callback") );
+    if ( frame )
+    {
+        frame->ProcessCommand(id);
+    }

 }
 
 #if !TARGET_CARBON
 }
 
 #if !TARGET_CARBON