Document wxBitmapToggleButton, add update UI event in Base class for all toggle buttons

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index f17bc48c4aa43a73dcbd0f1376b14279248d1388..566f3a34a7931297a85a9de229829abc96ea064f 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -39,6 +39,7 @@
 #include "wx/docview.h"
 #include "wx/filename.h"
 #include "wx/link.h"
 #include "wx/docview.h"
 #include "wx/filename.h"
 #include "wx/link.h"

+#include "wx/thread.h"

 
 #include <string.h>
 
 
 #include <string.h>
 


@@ -586,7 +587,7 @@ wxMacAppMenuEventHandler( EventHandlerCallRef WXUNUSED(handler),
             {
                 wxWindow *win = menu->GetInvokingWindow();
                 if (win)
             {
                 wxWindow *win = menu->GetInvokingWindow();
                 if (win)

-                    win->GetEventHandler()->ProcessEvent(wxevent);
+                    win->HandleWindowEvent(wxevent);

                 }
             }
     }
                 }
             }
     }


@@ -779,8 +780,6 @@ extern "C" void macPostedEventCallback(void *WXUNUSED(unused))
     wxTheApp->ProcessPendingEvents();
 }
 
     wxTheApp->ProcessPendingEvents();
 }
 

-ProcessSerialNumber gAppProcess ;
-

 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     // Mac-specific
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     // Mac-specific


@@ -791,7 +790,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     UMAInitToolbox( 4, sm_isEmbedded ) ;
 // TODO CHECK Can Be Removed    SetEventMask( everyEvent ) ;
 
     UMAInitToolbox( 4, sm_isEmbedded ) ;
 // TODO CHECK Can Be Removed    SetEventMask( everyEvent ) ;

-    UMAShowWatchCursor() ;

 
     // Mac OS X passes a process serial number command line argument when
     // the application is launched from the Finder. This argument must be
 
     // Mac OS X passes a process serial number command line argument when
     // the application is launched from the Finder. This argument must be


@@ -811,8 +809,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     if ( !wxAppBase::Initialize(argc, argv) )
         return false;
 
     if ( !wxAppBase::Initialize(argc, argv) )
         return false;
 

-    GetCurrentProcess(&gAppProcess);
-

 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif


@@ -839,8 +835,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
        // run loop takes ownership
        CFRelease(m_macEventPosted);
 
        // run loop takes ownership
        CFRelease(m_macEventPosted);
 

-    UMAShowArrowCursor() ;
-

     return true;
 }
 
     return true;
 }
 


@@ -909,8 +903,6 @@ void wxApp::CleanUp()
     // One last chance for pending objects to be cleaned up
     wxTheApp->DeletePendingObjects();
 
     // One last chance for pending objects to be cleaned up
     wxTheApp->DeletePendingObjects();
 

-    UMACleanupToolbox() ;
-

     if (!sm_isEmbedded)
         RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );
 
     if (!sm_isEmbedded)
         RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );
 


@@ -1417,7 +1409,7 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
     wxKeyEvent event(wxEVT_KEY_DOWN) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
 
     wxKeyEvent event(wxEVT_KEY_DOWN) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
 

-    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    handled = focus->HandleWindowEvent( event ) ;

     if ( handled && event.GetSkipped() )
         handled = false ;
 
     if ( handled && event.GetSkipped() )
         handled = false ;
 


@@ -1464,7 +1456,7 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
     bool handled;
     wxKeyEvent event( wxEVT_KEY_UP ) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
     bool handled;
     wxKeyEvent event( wxEVT_KEY_UP ) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;

-    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    handled = focus->HandleWindowEvent( event ) ;

 
     return handled ;
 }
 
     return handled ;
 }


@@ -1485,7 +1477,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
     if (tlw)
     {
         event.SetEventType( wxEVT_CHAR_HOOK );
     if (tlw)
     {
         event.SetEventType( wxEVT_CHAR_HOOK );

-        handled = tlw->GetEventHandler()->ProcessEvent( event );
+        handled = tlw->HandleWindowEvent( event );

         if ( handled && event.GetSkipped() )
             handled = false ;
     }
         if ( handled && event.GetSkipped() )
             handled = false ;
     }


@@ -1494,7 +1486,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
     {
         event.SetEventType( wxEVT_CHAR );
         event.Skip( false ) ;
     {
         event.SetEventType( wxEVT_CHAR );
         event.Skip( false ) ;

-        handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+        handled = focus->HandleWindowEvent( event ) ;

     }
 
     if ( !handled && (keyval == WXK_TAB) )
     }
 
     if ( !handled && (keyval == WXK_TAB) )


@@ -1510,7 +1502,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
                 /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
                 new_event.SetWindowChange( event.ControlDown() );
                 new_event.SetCurrentFocus( focus );
                 /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
                 new_event.SetWindowChange( event.ControlDown() );
                 new_event.SetCurrentFocus( focus );

-                handled = focus->GetParent()->GetEventHandler()->ProcessEvent( new_event );
+                handled = focus->GetParent()->HandleWindowEvent( new_event );

                 if ( handled && new_event.GetSkipped() )
                     handled = false ;
             }
                 if ( handled && new_event.GetSkipped() )
                     handled = false ;
             }


@@ -1549,7 +1541,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
                 // generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs)
                 wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
                 new_event.SetEventObject( focus );
                 // generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs)
                 wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
                 new_event.SetEventObject( focus );

-                handled = focus->GetEventHandler()->ProcessEvent( new_event );
+                handled = focus->HandleWindowEvent( new_event );

             }
         }
 #endif
             }
         }
 #endif