added carbonaccessors.o

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 36dedf86274f91f679c2c1f192dc4153b49c3f08..72d8437e63cf690832c1acdc218c5fd79db1c2b0 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -86,11 +86,13 @@
 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 

-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__) || defined(__WXMICROWIN__)) && !defined(__CYGWIN10__))

     #include <commctrl.h>
 #endif
 
     #include <commctrl.h>
 #endif
 

+#ifndef __WXMICROWIN__

 #include "wx/msw/msvcrt.h"
 #include "wx/msw/msvcrt.h"

+#endif

 
 // ----------------------------------------------------------------------------
 // conditional compilation
 
 // ----------------------------------------------------------------------------
 // conditional compilation


@@ -113,7 +115,8 @@
     #define _WIN32_IE 0x0200
 #endif
 
     #define _WIN32_IE 0x0200
 #endif
 

-#if _WIN32_IE >= 0x0300
+#if _WIN32_IE >= 0x0300 \
+    && !( defined(__MINGW32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )

     #include <shlwapi.h>
 #endif
 
     #include <shlwapi.h>
 #endif
 


@@ -124,7 +127,9 @@
 extern wxChar *wxBuffer;
 extern wxList *wxWinHandleList;
 extern wxList WXDLLEXPORT wxPendingDelete;
 extern wxChar *wxBuffer;
 extern wxList *wxWinHandleList;
 extern wxList WXDLLEXPORT wxPendingDelete;

+#ifndef __WXMICROWIN__

 extern void wxSetKeyboardHook(bool doIt);
 extern void wxSetKeyboardHook(bool doIt);

+#endif

 
 MSG s_currentMsg;
 wxApp *wxTheApp = NULL;
 
 MSG s_currentMsg;
 wxApp *wxTheApp = NULL;


@@ -234,12 +239,11 @@ bool wxApp::Initialize()
 
     wxBitmap::InitStandardHandlers();
 
 
     wxBitmap::InitStandardHandlers();
 

-#if defined(__WIN95__)
+#if defined(__WIN95__) && !defined(__WXMICROWIN__)

     InitCommonControls();
     InitCommonControls();

-

 #endif // __WIN95__
 
 #endif // __WIN95__
 

-#if wxUSE_OLE
+#if wxUSE_OLE || wxUSE_DRAG_AND_DROP

 
 #ifdef __WIN16__
     // for OLE, enlarge message queue to be as large as possible
 
 #ifdef __WIN16__
     // for OLE, enlarge message queue to be as large as possible


@@ -247,9 +251,11 @@ bool wxApp::Initialize()
     while (!SetMessageQueue(iMsg) && (iMsg -= 8))
         ;
 #endif // Win16
     while (!SetMessageQueue(iMsg) && (iMsg -= 8))
         ;
 #endif // Win16

+

     // we need to initialize OLE library
     if ( FAILED(::OleInitialize(NULL)) )
         wxLogError(_("Cannot initialize OLE"));
     // we need to initialize OLE library
     if ( FAILED(::OleInitialize(NULL)) )
         wxLogError(_("Cannot initialize OLE"));

+

 #endif // wxUSE_OLE
 
 #if wxUSE_CTL3D
 #endif // wxUSE_OLE
 
 #if wxUSE_CTL3D


@@ -257,7 +263,7 @@ bool wxApp::Initialize()
         wxLogError(wxT("Cannot register CTL3D"));
 
     Ctl3dAutoSubclass(wxhInstance);
         wxLogError(wxT("Cannot register CTL3D"));
 
     Ctl3dAutoSubclass(wxhInstance);

-#endif
+#endif // wxUSE_CTL3D

 
     // VZ: these icons are not in wx.rc anyhow (but should they?)!
 #if 0
 
     // VZ: these icons are not in wx.rc anyhow (but should they?)!
 #if 0


@@ -272,6 +278,7 @@ bool wxApp::Initialize()
 
     RegisterWindowClasses();
 
 
     RegisterWindowClasses();
 

+#ifndef __WXMICROWIN__

     // Create the brush for disabling bitmap buttons
 
     LOGBRUSH lb;
     // Create the brush for disabling bitmap buttons
 
     LOGBRUSH lb;


@@ -283,6 +290,7 @@ bool wxApp::Initialize()
         ::DeleteObject( (HGDIOBJ)lb.lbHatch );
     }
     //else: wxWindows resources are probably not linked in
         ::DeleteObject( (HGDIOBJ)lb.lbHatch );
     }
     //else: wxWindows resources are probably not linked in

+#endif

 
 #if wxUSE_PENWINDOWS
     wxRegisterPenWin();
 
 #if wxUSE_PENWINDOWS
     wxRegisterPenWin();


@@ -297,7 +305,9 @@ bool wxApp::Initialize()
     if (wxDummyChar) wxDummyChar++;
 #endif
 
     if (wxDummyChar) wxDummyChar++;
 #endif
 

+#ifndef __WXMICROWIN__

     wxSetKeyboardHook(TRUE);
     wxSetKeyboardHook(TRUE);

+#endif

 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules())
 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules())


@@ -561,7 +571,9 @@ void wxApp::CleanUp()
 
     //// WINDOWS-SPECIFIC CLEANUP
 
 
     //// WINDOWS-SPECIFIC CLEANUP
 

+#ifndef __WXMICROWIN__

     wxSetKeyboardHook(FALSE);
     wxSetKeyboardHook(FALSE);

+#endif

 
 #if wxUSE_PENWINDOWS
     wxCleanUpPenWin();
 
 #if wxUSE_PENWINDOWS
     wxCleanUpPenWin();


@@ -598,11 +610,14 @@ void wxApp::CleanUp()
     // GL: I'm annoyed ... I don't know where to put this and I don't want to
     // create a module for that as it's part of the core.
     delete wxPendingEvents;
     // GL: I'm annoyed ... I don't know where to put this and I don't want to
     // create a module for that as it's part of the core.
     delete wxPendingEvents;

+

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

-    // If we don't do the following, we get an apparent memory leak.
+    // If we don't do the following, we get an apparent memory leak
+#if wxUSE_VALIDATORS

     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();

-#endif
+#endif // wxUSE_VALIDATORS
+#endif // wxUSE_THREADS

 
     wxClassInfo::CleanUpClasses();
 
 
     wxClassInfo::CleanUpClasses();
 


@@ -640,8 +655,7 @@ int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char** WXUNUSED(argv) )
 
 int WXDLLEXPORT wxEntryInitGui()
 {
 
 int WXDLLEXPORT wxEntryInitGui()
 {

-    wxTheApp->OnInitGui();
-    return 0;
+    return wxTheApp->OnInitGui();

 }
 
 void WXDLLEXPORT wxEntryCleanup()
 }
 
 void WXDLLEXPORT wxEntryCleanup()


@@ -670,7 +684,10 @@ int wxEntry(WXHINSTANCE hInstance,
     // do check for memory leaks on program exit
     // (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free
     //  deallocated memory which may be used to simulate low-memory condition)
     // do check for memory leaks on program exit
     // (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free
     //  deallocated memory which may be used to simulate low-memory condition)

+#ifndef __WXMICROWIN__

     wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
     wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);

+#endif
+

 #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'


@@ -702,7 +719,7 @@ int wxEntry(WXHINSTANCE hInstance,
             wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
                          wxT("No initializer - use IMPLEMENT_APP macro.") );
 
             wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
                          wxT("No initializer - use IMPLEMENT_APP macro.") );
 

-            wxTheApp = (*wxApp::GetInitializerFunction()) ();
+            wxTheApp = (wxApp*) (*wxApp::GetInitializerFunction()) ();

         }
 
         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!") );


@@ -711,10 +728,6 @@ int wxEntry(WXHINSTANCE hInstance,
         wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
         wxTheApp->m_nCmdShow = nCmdShow;
 
         wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
         wxTheApp->m_nCmdShow = nCmdShow;
 

-        // GUI-specific initialisation. In fact on Windows we don't have any,
-        // but this call is provided for compatibility across platforms.
-        wxEntryInitGui();
-

         // We really don't want timestamps by default, because it means
         // we can't simply double-click on the error message and get to that
         // line in the source. So VC++ at least, let's have a sensible default.
         // We really don't want timestamps by default, because it means
         // we can't simply double-click on the error message and get to that
         // line in the source. So VC++ at least, let's have a sensible default.


@@ -734,7 +747,7 @@ int wxEntry(WXHINSTANCE hInstance,
         wxTheApp->SetExitOnFrameDelete(FALSE);
 
         // init the app
         wxTheApp->SetExitOnFrameDelete(FALSE);
 
         // init the app

-        retValue = wxTheApp->OnInit() ? 0 : -1;
+        retValue = wxEntryInitGui() && wxTheApp->OnInit() ? 0 : -1;

 
         // restore the old flag value
         wxTheApp->SetExitOnFrameDelete(exitOnLastFrameDelete);
 
         // restore the old flag value
         wxTheApp->SetExitOnFrameDelete(exitOnLastFrameDelete);


@@ -846,14 +859,9 @@ wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NUL
 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {

-    m_topWindow = NULL;
-    wxTheApp = this;
-    m_wantDebugOutput = TRUE;
-

     argc = 0;
     argv = NULL;
     m_printMode = wxPRINT_WINDOWS;
     argc = 0;
     argv = NULL;
     m_printMode = wxPRINT_WINDOWS;

-    m_exitOnFrameDelete = TRUE;

     m_auto3D = TRUE;
 }
 
     m_auto3D = TRUE;
 }
 


@@ -955,16 +963,21 @@ bool wxApp::DoMessage()
 #endif // wxUSE_THREADS
 
         // Process the message
 #endif // wxUSE_THREADS
 
         // Process the message

-        if ( !ProcessMessage((WXMSG *)&s_currentMsg) )
-        {
-            ::TranslateMessage(&s_currentMsg);
-            ::DispatchMessage(&s_currentMsg);
-        }
+        DoMessage((WXMSG *)&s_currentMsg);

     }
 
     return TRUE;
 }
 
     }
 
     return TRUE;
 }
 

+void wxApp::DoMessage(WXMSG *pMsg)
+{
+    if ( !ProcessMessage(pMsg) )
+    {
+        ::TranslateMessage((MSG *)pMsg);
+        ::DispatchMessage((MSG *)pMsg);
+    }
+}
+

 /*
  * Keep trying to process messages until WM_QUIT
  * received.
 /*
  * Keep trying to process messages until WM_QUIT
  * received.


@@ -1034,13 +1047,29 @@ void wxApp::Dispatch()
 bool wxApp::ProcessMessage(WXMSG *wxmsg)
 {
     MSG *msg = (MSG *)wxmsg;
 bool wxApp::ProcessMessage(WXMSG *wxmsg)
 {
     MSG *msg = (MSG *)wxmsg;

-    HWND hWnd = msg->hwnd;
-    wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hWnd);
+    HWND hwnd = msg->hwnd;
+    wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
+
+    // this may happen if the event occured in a standard modeless dialog (the
+    // only example of which I know of is the find/replace dialog) - then call
+    // IsDialogMessage() to make TAB navigation in it work
+    if ( !wndThis )
+    {
+        // we need to find the dialog containing this control as
+        // IsDialogMessage() just eats all the messages (i.e. returns TRUE for
+        // them) if we call it for the control itself
+        while ( ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD )
+        {
+            hwnd = ::GetParent(hwnd);
+        }
+
+        return ::IsDialogMessage(hwnd, msg) != 0;
+    }

 
 #if wxUSE_TOOLTIPS
     // we must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to
     // popup the tooltip bubbles
 
 #if wxUSE_TOOLTIPS
     // we must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to
     // popup the tooltip bubbles

-    if ( wndThis && (msg->message == WM_MOUSEMOVE) )
+    if ( (msg->message == WM_MOUSEMOVE) )

     {
         wxToolTip *tt = wndThis->GetToolTip();
         if ( tt )
     {
         wxToolTip *tt = wndThis->GetToolTip();
         if ( tt )


@@ -1050,23 +1079,39 @@ bool wxApp::ProcessMessage(WXMSG *wxmsg)
     }
 #endif // wxUSE_TOOLTIPS
 
     }
 #endif // wxUSE_TOOLTIPS
 

-    // Try translations first; find the youngest window with
-    // a translation table.
+    // allow the window to prevent certain messages from being
+    // translated/processed (this is currently used by wxTextCtrl to always
+    // grab Ctrl-C/V/X, even if they are also accelerators in some parent)
+    if ( !wndThis->MSWShouldPreProcessMessage(wxmsg) )
+    {
+        return FALSE;
+    }
+
+    // try translations first: the accelerators override everything

     wxWindow *wnd;
 
     for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
     {
     wxWindow *wnd;
 
     for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
     {

-        if ( wnd->MSWTranslateMessage(wxmsg) )
+        if ( wnd->MSWTranslateMessage(wxmsg))

             return TRUE;
             return TRUE;

+
+        // stop at first top level window, i.e. don't try to process the key
+        // strokes originating in a dialog using the accelerators of the parent
+        // frame - this doesn't make much sense
+        if ( wnd->IsTopLevel() )
+            break;

     }
 
     }
 

-    // Anyone for a non-translation message? Try youngest descendants first.
-    for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
+    // now try the other hooks (kbd navigation is handled here): we start from
+    // wndThis->GetParent() because wndThis->MSWProcessMessage() was already
+    // called above
+    for ( wnd = wndThis->GetParent(); wnd; wnd = wnd->GetParent() )

     {
         if ( wnd->MSWProcessMessage(wxmsg) )
             return TRUE;
     }
 
     {
         if ( wnd->MSWProcessMessage(wxmsg) )
             return TRUE;
     }
 

+    // no special preprocessing for this message, dispatch it normally

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -1097,6 +1142,14 @@ void wxApp::OnIdle(wxIdleEvent& event)
     wxLog::FlushActive();
 #endif // wxUSE_LOG
 
     wxLog::FlushActive();
 #endif // wxUSE_LOG
 

+#if wxUSE_DC_CACHEING
+    // automated DC cache management: clear the cached DCs and bitmap
+    // if it's likely that the app has finished with them, that is, we
+    // get an idle event and we're not dragging anything.
+    if (!::GetKeyState(MK_LBUTTON) && !::GetKeyState(MK_MBUTTON) && !::GetKeyState(MK_RBUTTON))
+        wxDC::ClearCache();
+#endif // wxUSE_DC_CACHEING
+

     // Send OnIdle events to all windows
     if ( SendIdleEvents() )
     {
     // Send OnIdle events to all windows
     if ( SendIdleEvents() )
     {


@@ -1187,6 +1240,9 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
 /* static */
 int wxApp::GetComCtl32Version()
 {
 /* static */
 int wxApp::GetComCtl32Version()
 {

+#ifdef __WXMICROWIN__
+    return 0;
+#else

     // cache the result
     static int s_verComCtl32 = -1;
 
     // cache the result
     static int s_verComCtl32 = -1;
 


@@ -1269,6 +1325,7 @@ int wxApp::GetComCtl32Version()
     }
 
     return s_verComCtl32;
     }
 
     return s_verComCtl32;

+#endif

 }
 
 void wxExit()
 }
 
 void wxExit()


@@ -1289,11 +1346,11 @@ bool wxYield()
     // normally result in message boxes popping up &c
     wxLog::Suspend();
 
     // normally result in message boxes popping up &c
     wxLog::Suspend();
 

-#ifdef __WXDEBUG__    
+#ifdef __WXDEBUG__

     if (gs_inYield)
         wxFAIL_MSG( wxT("wxYield called recursively" ) );
 #endif
     if (gs_inYield)
         wxFAIL_MSG( wxT("wxYield called recursively" ) );
 #endif

-    
+

     gs_inYield = TRUE;
 
     // we don't want to process WM_QUIT from here - it should be processed in
     gs_inYield = TRUE;
 
     // we don't want to process WM_QUIT from here - it should be processed in


@@ -1327,7 +1384,7 @@ bool wxYieldIfNeeded()
 {
     if (gs_inYield)
         return FALSE;
 {
     if (gs_inYield)
         return FALSE;

-        
+

     return wxYield();
 }
 
     return wxYield();
 }
 


@@ -1340,7 +1397,8 @@ bool wxHandleFatalExceptions(bool doit)
     return TRUE;
 #else
     wxFAIL_MSG(_T("set wxUSE_ON_FATAL_EXCEPTION to 1 to sue this function"));
     return TRUE;
 #else
     wxFAIL_MSG(_T("set wxUSE_ON_FATAL_EXCEPTION to 1 to sue this function"));

-
+       
+       (void)doit;

     return FALSE;
 #endif
 }
     return FALSE;
 #endif
 }