include X11/Xutil.h for wxMotif compilation

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 3e1b8065fc34c7f47bc405a2adee8fb981154cba..3a350c95023f9c9e61ab322db1872a6ac6036d75 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.cpp
+// Name:        src/mac/carbon/app.cpp

 // Purpose:     wxApp
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxApp
 // Author:      Stefan Csomor
 // Modified by:


@@ -11,27 +11,31 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/window.h"
-#include "wx/frame.h"
-#include "wx/button.h"

 #include "wx/app.h"
 #include "wx/app.h"

-#include "wx/utils.h"
-#include "wx/gdicmn.h"
-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/cursor.h"
-#include "wx/intl.h"
-#include "wx/icon.h"
-#include "wx/palette.h"
-#include "wx/dc.h"
-#include "wx/dialog.h"
-#include "wx/msgdlg.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/frame.h"
+    #include "wx/dc.h"
+    #include "wx/button.h"
+    #include "wx/menu.h"
+    #include "wx/pen.h"
+    #include "wx/brush.h"
+    #include "wx/palette.h"
+    #include "wx/icon.h"
+    #include "wx/cursor.h"
+    #include "wx/dialog.h"
+    #include "wx/msgdlg.h"
+    #include "wx/textctrl.h"
+    #include "wx/memory.h"
+    #include "wx/gdicmn.h"
+#endif
+

 #include "wx/module.h"
 #include "wx/module.h"

-#include "wx/memory.h"

 #include "wx/tooltip.h"
 #include "wx/tooltip.h"

-#include "wx/textctrl.h"
-#include "wx/menu.h"

 #include "wx/docview.h"
 #include "wx/filename.h"
 
 #include "wx/docview.h"
 #include "wx/filename.h"
 


@@ -63,8 +67,6 @@
 #  include <Devices.h>
 #endif
 
 #  include <Devices.h>
 #endif
 

-extern wxList wxPendingDelete;
-

 #if wxUSE_THREADS
 extern size_t g_numberOfThreads;
 #endif
 #if wxUSE_THREADS
 extern size_t g_numberOfThreads;
 #endif


@@ -359,7 +361,7 @@ struct IdPair
     int wxId ;
 } ;
 
     int wxId ;
 } ;
 

-IdPair gCommandIds [] = 
+IdPair gCommandIds [] =

 {
     { kHICommandCut ,           wxID_CUT } ,
     { kHICommandCopy ,          wxID_COPY } ,
 {
     { kHICommandCut ,           wxID_CUT } ,
     { kHICommandCopy ,          wxID_COPY } ,


@@ -370,10 +372,10 @@ IdPair gCommandIds [] =
     { kHICommandRedo ,          wxID_REDO } ,
 } ;
 
     { kHICommandRedo ,          wxID_REDO } ,
 } ;
 

-int wxMacCommandToId( UInt32 macCommandId ) 
+int wxMacCommandToId( UInt32 macCommandId )

 {
     int wxid = 0 ;
 {
     int wxid = 0 ;

-    
+

     switch ( macCommandId )
     {
         case kHICommandPreferences :
     switch ( macCommandId )
     {
         case kHICommandPreferences :


@@ -408,10 +410,10 @@ int wxMacCommandToId( UInt32 macCommandId )
     return wxid ;
 }
 
     return wxid ;
 }
 

-UInt32 wxIdToMacCommand( int wxId ) 
+UInt32 wxIdToMacCommand( int wxId )

 {
     UInt32 macId = 0 ;
 {
     UInt32 macId = 0 ;

-    
+

     if ( wxId == wxApp::s_macPreferencesMenuItemId )
         macId = kHICommandPreferences ;
     else if (wxId == wxApp::s_macExitMenuItemId)
     if ( wxId == wxApp::s_macPreferencesMenuItemId )
         macId = kHICommandPreferences ;
     else if (wxId == wxApp::s_macExitMenuItemId)


@@ -436,7 +438,7 @@ UInt32 wxIdToMacCommand( int wxId )
     return macId ;
 }
 
     return macId ;
 }
 

-wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) 
+wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )

 {
     wxMenu* itemMenu = NULL ;
     int id = 0 ;
 {
     wxMenu* itemMenu = NULL ;
     int id = 0 ;


@@ -581,7 +583,7 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
     if ( item )
     {
         wxASSERT( itemMenu != NULL ) ;
     if ( item )
     {
         wxASSERT( itemMenu != NULL ) ;

-        
+

         switch ( cEvent.GetKind() )
         {
             case kEventProcessCommand :
         switch ( cEvent.GetKind() )
         {
             case kEventProcessCommand :


@@ -598,16 +600,16 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
             {
                 wxUpdateUIEvent event(id);
                 event.SetEventObject( itemMenu );
             {
                 wxUpdateUIEvent event(id);
                 event.SetEventObject( itemMenu );

-                                
+

                 bool processed = false;
                 bool processed = false;

-                
+

                 // Try the menu's event handler
                 {
                     wxEvtHandler *handler = itemMenu->GetEventHandler();
                     if ( handler )
                         processed = handler->ProcessEvent(event);
                 }
                 // Try the menu's event handler
                 {
                     wxEvtHandler *handler = itemMenu->GetEventHandler();
                     if ( handler )
                         processed = handler->ProcessEvent(event);
                 }

-                
+

                 // Try the window the menu was popped up from
                 // (and up through the hierarchy)
                 if ( !processed )
                 // Try the window the menu was popped up from
                 // (and up through the hierarchy)
                 if ( !processed )


@@ -621,11 +623,11 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
                             processed = win->GetEventHandler()->ProcessEvent(event);
                             break;
                         }
                             processed = win->GetEventHandler()->ProcessEvent(event);
                             break;
                         }

-                        
+

                         menu = menu->GetParent();
                     }
                 }
                         menu = menu->GetParent();
                     }
                 }

-                
+

                 if ( processed )
                 {
                     // if anything changed, update the changed attribute
                 if ( processed )
                 {
                     // if anything changed, update the changed attribute


@@ -727,11 +729,6 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler )
 
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler )
 

-#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__)
-// we know it's there ;-)
-WXIMPORT char std::__throws_bad_alloc ;
-#endif
-

 #ifdef __WXDEBUG__
 
 pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options,
 #ifdef __WXDEBUG__
 
 pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options,


@@ -1254,7 +1251,6 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr )
 #endif // wxUSE_THREADS
 }
 
 #endif // wxUSE_THREADS
 }
 

-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 ;


@@ -1447,11 +1443,17 @@ wxMouseState wxGetMouseState()
     ms.SetX(pt.x);
     ms.SetY(pt.y);
 
     ms.SetX(pt.x);
     ms.SetY(pt.y);
 

+#if TARGET_API_MAC_OSX

     UInt32 buttons = GetCurrentButtonState();
     ms.SetLeftDown( (buttons & 0x01) != 0 );
     ms.SetMiddleDown( (buttons & 0x04) != 0 );
     ms.SetRightDown( (buttons & 0x02) != 0 );
     UInt32 buttons = GetCurrentButtonState();
     ms.SetLeftDown( (buttons & 0x01) != 0 );
     ms.SetMiddleDown( (buttons & 0x04) != 0 );
     ms.SetRightDown( (buttons & 0x02) != 0 );

-    
+#else
+    ms.SetLeftDown( Button() );
+    ms.SetMiddleDown( 0 );
+    ms.SetRightDown( 0 );
+#endif
+

     UInt32 modifiers = GetCurrentKeyModifiers();
     ms.SetControlDown(modifiers & controlKey);
     ms.SetShiftDown(modifiers & shiftKey);
     UInt32 modifiers = GetCurrentKeyModifiers();
     ms.SetControlDown(modifiers & controlKey);
     ms.SetShiftDown(modifiers & shiftKey);


@@ -1468,10 +1470,10 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
     if ( !focus )
         return false ;
 
     if ( !focus )
         return false ;
 

-    bool handled; 
+    bool handled;

     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 ) ;
     if ( handled && event.GetSkipped() )
         handled = false ;
     handled = focus->GetEventHandler()->ProcessEvent( event ) ;
     if ( handled && event.GetSkipped() )
         handled = false ;


@@ -1510,7 +1512,7 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
     wxKeyEvent event( wxEVT_KEY_UP ) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
     handled = focus->GetEventHandler()->ProcessEvent( event ) ;
     wxKeyEvent event( wxEVT_KEY_UP ) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
     handled = focus->GetEventHandler()->ProcessEvent( event ) ;

-    
+

     return handled ;
 }
 
     return handled ;
 }
 


@@ -1518,7 +1520,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
 {
     if ( !focus )
         return false ;
 {
     if ( !focus )
         return false ;

-    
+

     wxKeyEvent event(wxEVT_CHAR) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
     long keyval = event.m_keyCode ;
     wxKeyEvent event(wxEVT_CHAR) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
     long keyval = event.m_keyCode ;


@@ -1526,7 +1528,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
     bool handled = false ;
 
     wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;
     bool handled = false ;
 
     wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;

-        
+

     if (tlw)
     {
         event.SetEventType( wxEVT_CHAR_HOOK );
     if (tlw)
     {
         event.SetEventType( wxEVT_CHAR_HOOK );


@@ -1541,7 +1543,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
         event.Skip( false ) ;
         handled = focus->GetEventHandler()->ProcessEvent( event ) ;
     }
         event.Skip( false ) ;
         handled = focus->GetEventHandler()->ProcessEvent( event ) ;
     }

-        
+

     if ( !handled && (keyval == WXK_TAB) )
     {
         wxWindow* iter = focus->GetParent() ;
     if ( !handled && (keyval == WXK_TAB) )
     {
         wxWindow* iter = focus->GetParent() ;


@@ -1596,7 +1598,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
     return handled ;
 }
 
     return handled ;
 }
 

-// This method handles common code for SendKeyDown, SendKeyUp, and SendChar events. 
+// This method handles common code for SendKeyDown, SendKeyUp, and SendChar events.

 void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
 {
     short keycode, keychar ;
 void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
 {
     short keycode, keychar ;


@@ -1665,8 +1667,6 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess
     event.m_keyCode = keyval ;
 #if wxUSE_UNICODE
     event.m_uniChar = uniChar ;
     event.m_keyCode = keyval ;
 #if wxUSE_UNICODE
     event.m_uniChar = uniChar ;

-    if ( event.GetEventType() == wxEVT_CHAR )
-        event.m_keyCode = uniChar ;

 #endif
 
     event.m_rawCode = keymessage;
 #endif
 
     event.m_rawCode = keymessage;