#define _WIN32_IE 0x0200
#endif
-#if _WIN32_IE >= 0x0300 \
- && !( defined(__MINGW32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
+#if _WIN32_IE >= 0x0300 && !defined(__MINGW32__)
#include <shlwapi.h>
#endif
// ---------------------------------------------------------------------------
extern wxChar *wxBuffer;
-extern wxList *wxWinHandleList;
extern wxList WXDLLEXPORT wxPendingDelete;
#ifndef __WXMICROWIN__
extern void wxSetKeyboardHook(bool doIt);
wxRegisterPenWin();
#endif
- wxWinHandleList = new wxList(wxKEY_INTEGER);
+ wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100);
// This is to foil optimizations in Visual C++ that throw out dummy.obj.
// PLEASE DO NOT ALTER THIS.
return TRUE;
}
+// ---------------------------------------------------------------------------
+// UnregisterWindowClasses
+// ---------------------------------------------------------------------------
+
+bool wxApp::UnregisterWindowClasses()
+{
+ bool retval = TRUE;
+
+ // frame window class.
+ if ( !UnregisterClass(wxFrameClassName, wxhInstance) )
+ {
+ wxLogLastError(wxT("UnregisterClass(frame)"));
+
+ retval = FALSE;
+ }
+
+ // "no redraw" frame
+ if ( !UnregisterClass(wxFrameClassNameNoRedraw, wxhInstance) )
+ {
+ wxLogLastError(wxT("UnregisterClass(no redraw frame)"));
+
+ return FALSE;
+ }
+
+ // MDI frame window class.
+ if ( !UnregisterClass(wxMDIFrameClassName, wxhInstance) )
+ {
+ wxLogLastError(wxT("UnregisterClass(MDI parent)"));
+
+ retval = FALSE;
+ }
+
+ // "no redraw" MDI frame
+ if ( !UnregisterClass(wxMDIFrameClassNameNoRedraw, wxhInstance) )
+ {
+ wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)"));
+
+ retval = FALSE;
+ }
+
+ // MDI child frame window class.
+ if ( !UnregisterClass(wxMDIChildFrameClassName, wxhInstance) )
+ {
+ wxLogLastError(wxT("UnregisterClass(MDI child)"));
+
+ retval = FALSE;
+ }
+
+ // "no redraw" MDI child frame
+ if ( !UnregisterClass(wxMDIChildFrameClassNameNoRedraw, wxhInstance) )
+ {
+ wxLogLastError(wxT("UnregisterClass(no redraw MDI child)"));
+
+ retval = FALSE;
+ }
+
+ // panel window class.
+ if ( !UnregisterClass(wxPanelClassName, wxhInstance) )
+ {
+ wxLogLastError(wxT("UnregisterClass(panel)"));
+
+ retval = FALSE;
+ }
+
+ // no redraw panel window class.
+ if ( !UnregisterClass(wxPanelClassNameNR, wxhInstance) )
+ {
+ wxLogLastError(wxT("UnregisterClass(no redraw panel)"));
+
+ retval = FALSE;
+ }
+
+ // canvas and textsubwindow class name
+ if ( !UnregisterClass(wxCanvasClassName, wxhInstance) )
+ {
+ wxLogLastError(wxT("UnregisterClass(canvas)"));
+
+ retval = FALSE;
+ }
+
+ if ( !UnregisterClass(wxCanvasClassNameNR, wxhInstance) )
+ {
+ wxLogLastError(wxT("UnregisterClass(no redraw canvas)"));
+
+ retval = FALSE;
+ }
+
+ return retval;
+}
+
// ---------------------------------------------------------------------------
// Convert Windows to argc, argv style
// ---------------------------------------------------------------------------
::OleUninitialize();
#endif
+#ifdef WXMAKINGDLL
+ // for an EXE the classes are unregistered when it terminates but DLL may
+ // be loaded several times (load/unload/load) into the same process in
+ // which case the registration will fail after the first time if we don't
+ // unregister the classes now
+ UnregisterWindowClasses();
+#endif // WXMAKINGDLL
+
#if wxUSE_CTL3D
Ctl3dUnregister(wxhInstance);
#endif
- if (wxWinHandleList)
- delete wxWinHandleList;
+ delete wxWinHandleHash;
// 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.
// 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 )
+ while ( hwnd && ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD )
{
hwnd = ::GetParent(hwnd);
}
- return ::IsDialogMessage(hwnd, msg) != 0;
+ return hwnd && ::IsDialogMessage(hwnd, msg) != 0;
}
#if wxUSE_TOOLTIPS
}
#endif // wxUSE_TOOLTIPS
+ // 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;
break;
}
- // now try the other hooks (kbd navigation is handled here)
- 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;
}
+ // no special preprocessing for this message, dispatch it normally
return FALSE;
}
// Yield to incoming messages
-static bool gs_inYield = FALSE;
-
-bool wxYield()
+bool wxApp::Yield(bool onlyIfNeeded)
{
+ // MT-FIXME
+ static bool s_inYield = FALSE;
+
// disable log flushing from here because a call to wxYield() shouldn't
// normally result in message boxes popping up &c
wxLog::Suspend();
-#ifdef __WXDEBUG__
- if (gs_inYield)
- wxFAIL_MSG( wxT("wxYield called recursively" ) );
-#endif
+ if ( s_inYield )
+ {
+ if ( !onlyIfNeeded )
+ {
+ wxFAIL_MSG( wxT("wxYield called recursively" ) );
+ }
+
+ return FALSE;
+ }
- gs_inYield = TRUE;
+ s_inYield = TRUE;
// we don't want to process WM_QUIT from here - it should be processed in
// the main event loop in order to stop it
break;
}
- // If they are pending events, we must process them.
- if (wxTheApp)
- wxTheApp->ProcessPendingEvents();
+ // if there are pending events, we must process them.
+ ProcessPendingEvents();
// let the logs be flashed again
wxLog::Resume();
- gs_inYield = FALSE;
+ s_inYield = FALSE;
return TRUE;
}
-// Yield to incoming messages; but fail silently if recursion is detected.
-bool wxYieldIfNeeded()
-{
- if (gs_inYield)
- return FALSE;
-
- return wxYield();
-}
-
bool wxHandleFatalExceptions(bool doit)
{
#if wxUSE_ON_FATAL_EXCEPTION
return TRUE;
#else
- wxFAIL_MSG(_T("set wxUSE_ON_FATAL_EXCEPTION to 1 to sue this function"));
-
- (void)doit;
+ wxFAIL_MSG(_T("set wxUSE_ON_FATAL_EXCEPTION to 1 to use this function"));
+
+ (void)doit;
return FALSE;
#endif
}
projects / wxWidgets.git / blobdiff