The code in wxMac's listbox was too ambitious in filtering

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

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index ade0e6938efc7c63077b31986b3a14aad42592db..b27475c3f1b1006ba86adc35a53e8c03102551e7 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -94,41 +94,31 @@ bool wxApp::s_macSupportPCMenuShortcuts = true ;
 long wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
 wxString wxApp::s_macHelpMenuTitleName = "&Help" ;
 
 long wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
 wxString wxApp::s_macHelpMenuTitleName = "&Help" ;
 

-#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
+pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
+pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
+pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
+pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
+
+

 pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long refcon )
 pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long refcon )

-#else
-pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , unsigned long refcon )
-#endif

 {
     wxApp* app = (wxApp*) refcon ;
     return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ;
 }
 
 {
     wxApp* app = (wxApp*) refcon ;
     return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ;
 }
 

-#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)

 pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon )
 pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon )

-#else
-pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , unsigned long refcon )
-#endif

 {
     wxApp* app = (wxApp*) refcon ;
     return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ;
 }
 
 {
     wxApp* app = (wxApp*) refcon ;
     return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ;
 }
 

-#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)

 pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon )
 pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon )

-#else
-pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , unsigned long refcon )
-#endif

 {
     wxApp* app = (wxApp*) refcon ;
     return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ;
 }
 
 {
     wxApp* app = (wxApp*) refcon ;
     return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ;
 }
 

-#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)

 pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon )
 pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon )

-#else
-pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , unsigned long refcon )
-#endif

 {
     wxApp* app = (wxApp*) refcon ;
     return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
 {
     wxApp* app = (wxApp*) refcon ;
     return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;


@@ -430,7 +420,7 @@ bool wxApp::Initialize()
     {
         error = kMacSTROldSystem  ;
     }
     {
         error = kMacSTROldSystem  ;
     }

-    else if ( theSystem < 0x0750 )
+    else if ( theSystem < 0x0860 )

     {
         error = kMacSTROldSystem  ;
     }
     {
         error = kMacSTROldSystem  ;
     }


@@ -619,6 +609,28 @@ void wxApp::CleanUp()
     #endif
 }
 
     #endif
 }
 

+//----------------------------------------------------------------------
+// wxEntry
+//----------------------------------------------------------------------
+
+int wxEntryStart( int argc, char *argv[] )
+{
+    return wxApp::Initialize();
+}
+
+
+int wxEntryInitGui()
+{
+    return wxTheApp->OnInitGui();
+}
+
+
+void wxEntryCleanup()
+{
+    wxApp::CleanUp();
+}
+
+

 int wxEntry( int argc, char *argv[] , bool enterLoop )
 {
 #ifdef __MWERKS__
 int wxEntry( int argc, char *argv[] , bool enterLoop )
 {
 #ifdef __MWERKS__


@@ -632,7 +644,7 @@ int wxEntry( int argc, char *argv[] , bool enterLoop )
     wxDebugContext::SetCheckpoint();
 #endif
 #endif
     wxDebugContext::SetCheckpoint();
 #endif
 #endif

-    if (!wxApp::Initialize()) {
+    if (!wxEntryStart(argc, argv)) {

         return 0;
     }
    // create the application object or ensure that one already exists
         return 0;
     }
    // create the application object or ensure that one already exists


@@ -649,24 +661,23 @@ int wxEntry( int argc, char *argv[] , bool enterLoop )
 
     wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
 
 
     wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
 

-#ifdef __WXMAC__
-  argc = 0 ; // currently we don't support files as parameters
+#ifndef __DARWIN__
+    argc = 0 ; // currently we don't support files as parameters

 #endif
 #endif

+    // we could try to get the open apple events here to adjust argc and argv better

 
 

-  wxTheApp->argc = argc;
-  wxTheApp->argv = argv;
+    wxTheApp->argc = argc;
+    wxTheApp->argv = argv;

 
 

-  // GUI-specific initialization, such as creating an app context.
-  wxTheApp->OnInitGui();
+    // GUI-specific initialization, such as creating an app context.
+    wxEntryInitGui();

 
 

-  // we could try to get the open apple events here to adjust argc and argv better

 
 

+    // Here frames insert themselves automatically
+    // into wxTopLevelWindows by getting created
+    // in OnInit().

 
 

-  // Here frames insert themselves automatically
-  // into wxTopLevelWindows by getting created
-  // in OnInit().
-
-  int retValue = 0;
+    int retValue = 0;

 
     if ( wxTheApp->OnInit() )
     {
 
     if ( wxTheApp->OnInit() )
     {


@@ -699,7 +710,7 @@ int wxEntry( int argc, char *argv[] , bool enterLoop )
 
     wxTheApp->OnExit();
 
 
     wxTheApp->OnExit();
 

-    wxApp::CleanUp();
+    wxEntryCleanup();

 
     return retValue;
 }
 
     return retValue;
 }


@@ -976,7 +987,7 @@ void wxApp::MacSuspend( bool convertClipboard )
             MacConvertPrivateToPublicScrap() ;
         }
 
             MacConvertPrivateToPublicScrap() ;
         }
 

-        UMAHideFloatingWindows() ;
+        ::HideFloatingWindows() ;

 }
 
 void wxApp::MacResume( bool convertClipboard )
 }
 
 void wxApp::MacResume( bool convertClipboard )


@@ -987,7 +998,7 @@ void wxApp::MacResume( bool convertClipboard )
             MacConvertPublicToPrivateScrap() ;
         }
 
             MacConvertPublicToPrivateScrap() ;
         }
 

-        UMAShowFloatingWindows() ;
+        ::ShowFloatingWindows() ;

 }
 
 void wxApp::MacConvertPrivateToPublicScrap()
 }
 
 void wxApp::MacConvertPrivateToPublicScrap()


@@ -1002,18 +1013,18 @@ void wxApp::MacDoOneEvent()
 {
   EventRecord event ;
 
 {
   EventRecord event ;
 

-    long sleepTime = 1 ; // GetCaretTime() / 4 ;
+    long sleepTime = 1; // GetCaretTime() / 4 ;

 
 

-    if (WaitNextEvent(everyEvent, &event,sleepTime, s_macCursorRgn))
+    if (WaitNextEvent(everyEvent, &event, sleepTime, s_macCursorRgn))

     {
     {

-    MacHandleOneEvent( &event );
+        MacHandleOneEvent( &event );

     }
     else
     {
         // idlers
     }
     else
     {
         // idlers

-        WindowPtr window = UMAFrontWindow() ;
+        WindowPtr window = ::FrontWindow() ;

         if ( window )
         if ( window )

-            UMAIdleControls( window ) ;
+            ::IdleControls( window ) ;

 
         wxTheApp->ProcessIdle() ;
     }
 
         wxTheApp->ProcessIdle() ;
     }


@@ -1022,7 +1033,7 @@ void wxApp::MacDoOneEvent()
 
     // repeaters
 
 
     // repeaters
 

-  DeletePendingObjects() ;
+    DeletePendingObjects() ;

     wxMacProcessNotifierAndPendingEvents() ;
 }
 
     wxMacProcessNotifierAndPendingEvents() ;
 }
 


@@ -1093,10 +1104,10 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
     wxToolTip::RemoveToolTips() ;
 
     WindowRef window;
     wxToolTip::RemoveToolTips() ;
 
     WindowRef window;

-    WindowRef frontWindow = UMAFrontNonFloatingWindow() ;
+    WindowRef frontWindow = ::FrontNonFloatingWindow() ;

     WindowAttributes frontWindowAttributes = NULL ;
     if ( frontWindow )
     WindowAttributes frontWindowAttributes = NULL ;
     if ( frontWindow )

-        UMAGetWindowAttributes( frontWindow , &frontWindowAttributes ) ;
+        ::GetWindowAttributes( frontWindow , &frontWindowAttributes ) ;

 
     short windowPart = ::FindWindow(ev->where, &window);
     wxWindow* win = wxFindWinFromMacWindow( window ) ;
 
     short windowPart = ::FindWindow(ev->where, &window);
     wxWindow* win = wxFindWinFromMacWindow( window ) ;


@@ -1233,7 +1244,7 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
                     {
                         if ( win )
                             win->MacMouseDown( ev , windowPart ) ;
                     {
                         if ( win )
                             win->MacMouseDown( ev , windowPart ) ;

-                        UMASelectWindow( window ) ;
+                        ::SelectWindow( window ) ;

                     }
                 }
                 else
                     }
                 }
                 else


@@ -1270,6 +1281,7 @@ void wxApp::MacHandleMouseUpEvent( EventRecord *ev )
     }
 }
 
     }
 }
 

+long wxMacTranslateKey(unsigned char key, unsigned char code) ;

 long wxMacTranslateKey(unsigned char key, unsigned char code)
 {
     long retval = key ;
 long wxMacTranslateKey(unsigned char key, unsigned char code)
 {
     long retval = key ;


@@ -1517,11 +1529,11 @@ void wxApp::MacHandleActivateEvent( EventRecord *ev )
     {
         bool activate = (ev->modifiers & activeFlag ) ;
         WindowClass wclass ;
     {
         bool activate = (ev->modifiers & activeFlag ) ;
         WindowClass wclass ;

-        UMAGetWindowClass ( window , &wclass ) ;
+        ::GetWindowClass ( window , &wclass ) ;

         if ( wclass == kFloatingWindowClass )
         {
             // if it is a floater we activate/deactivate the front non-floating window instead
         if ( wclass == kFloatingWindowClass )
         {
             // if it is a floater we activate/deactivate the front non-floating window instead

-            window = UMAFrontNonFloatingWindow() ;
+            window = ::FrontNonFloatingWindow() ;

         }
         wxWindow* win = wxFindWinFromMacWindow( window ) ;
         if ( win )
         }
         wxWindow* win = wxFindWinFromMacWindow( window ) ;
         if ( win )


@@ -1585,11 +1597,11 @@ void wxApp::MacHandleOSEvent( EventRecord *ev )
                     // our idea of the active window with the process manager's - which it already activated
 
                     if ( !doesActivate )
                     // our idea of the active window with the process manager's - which it already activated
 
                     if ( !doesActivate )

-                        oldFrontWindow = UMAFrontNonFloatingWindow() ;
+                        oldFrontWindow = ::FrontNonFloatingWindow() ;

 
                     MacResume( convertClipboard ) ;
 
 
                     MacResume( convertClipboard ) ;
 

-                    newFrontWindow = UMAFrontNonFloatingWindow() ;
+                    newFrontWindow = ::FrontNonFloatingWindow() ;

 
                     if ( oldFrontWindow )
                     {
 
                     if ( oldFrontWindow )
                     {


@@ -1611,13 +1623,15 @@ void wxApp::MacHandleOSEvent( EventRecord *ev )
                     // in case this suspending did close an active window, another one might
                     // have surfaced -> lets deactivate that one
 
                     // in case this suspending did close an active window, another one might
                     // have surfaced -> lets deactivate that one
 

-                    WindowRef newActiveWindow = UMAGetActiveNonFloatingWindow() ;
+/* TODO : find out what to do on systems < 10 , perhaps FrontNonFloatingWindow
+                    WindowRef newActiveWindow = ::ActiveNonFloatingWindow() ;

                     if ( newActiveWindow )
                     {
                         wxWindow* win = wxFindWinFromMacWindow( newActiveWindow ) ;
                         if ( win )
                             win->MacActivate( ev , false ) ;
                     }
                     if ( newActiveWindow )
                     {
                         wxWindow* win = wxFindWinFromMacWindow( newActiveWindow ) ;
                         if ( win )
                             win->MacActivate( ev , false ) ;
                     }

+*/

                 }
             }
             break ;
                 }
             }
             break ;


@@ -1677,9 +1691,20 @@ void wxApp::MacHandleOSEvent( EventRecord *ev )
                         break ;
                     default:
                         {
                         break ;
                     default:
                         {

-                            if ( s_lastMouseDown == 0 )
-                                ev->modifiers |= btnState ;
-
+                            // if ( s_lastMouseDown == 0 )
+                            //     ev->modifiers |= btnState ;
+                                
+                            // Calling GetNextEvent with a zero event mask will always
+                            // pass back a null event. However, it fills the EventRecord
+                            // with the state of the modifier keys. This is needed since
+                            // the modifier state returned by WaitForNextEvent often is
+                            // wrong mouse move events. The attempt above to correct this
+                            // didn't always work (under OS X at least).
+            
+                            EventRecord tmp;
+                            ::GetNextEvent(0, &tmp);
+                            ev->modifiers = tmp.modifiers;
+                            

                             wxWindow* win = wxFindWinFromMacWindow( window ) ;
                             if ( win )
                                 win->MacMouseMoved( ev , windowPart ) ;
                             wxWindow* win = wxFindWinFromMacWindow( window ) ;
                             if ( win )
                                 win->MacMouseMoved( ev , windowPart ) ;