#include "wx/dynarray.h"
#include "wx/wxchar.h"
#include "wx/icon.h"
+ #include "wx/log.h"
#endif
-#include "wx/log.h"
+#include "wx/cmdline.h"
+#include "wx/filename.h"
#include "wx/module.h"
#include "wx/msw/private.h"
#define _WIN32_IE 0x0200
#endif
-#if _WIN32_IE >= 0x0300 \
- && !( defined(__MINGW32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
+#if _WIN32_IE >= 0x0300 && \
+ (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \
+ !defined(__CYGWIN__)
#include <shlwapi.h>
#endif
// ---------------------------------------------------------------------------
extern wxChar *wxBuffer;
-extern wxList *wxWinHandleList;
extern wxList WXDLLEXPORT wxPendingDelete;
#ifndef __WXMICROWIN__
extern void wxSetKeyboardHook(bool doIt);
// NB: all "NoRedraw" classes must have the same names as the "normal" classes
// with NR suffix - wxWindow::MSWCreate() supposes this
-const wxChar *wxFrameClassName = wxT("wxFrameClass");
-const wxChar *wxFrameClassNameNoRedraw = wxT("wxFrameClassNR");
+const wxChar *wxCanvasClassName = wxT("wxWindowClass");
+const wxChar *wxCanvasClassNameNR = wxT("wxWindowClassNR");
const wxChar *wxMDIFrameClassName = wxT("wxMDIFrameClass");
const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR");
const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass");
const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR");
-const wxChar *wxPanelClassName = wxT("wxPanelClass");
-const wxChar *wxPanelClassNameNR = wxT("wxPanelClassNR");
-const wxChar *wxCanvasClassName = wxT("wxCanvasClass");
-const wxChar *wxCanvasClassNameNR = wxT("wxCanvasClassNR");
HICON wxSTD_FRAME_ICON = (HICON) NULL;
HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL;
bool wxApp::Initialize()
{
// the first thing to do is to check if we're trying to run an Unicode
- // program under Win9x - if so, abort right now as it has no chance to
- // work
-#if wxUSE_UNICODE
+ // program under Win9x w/o MSLU emulation layer - if so, abort right now
+ // as it has no chance to work
+#if wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
if ( wxGetOsVersion() != wxWINDOWS_NT )
{
// note that we can use MessageBoxW() as it's implemented even under
::MessageBox
(
NULL,
- _T("This program uses Unicode and requires Windows NT/2000.\nProgram aborted."),
+ _T("This program uses Unicode and requires Windows NT/2000/XP.\nProgram aborted."),
_T("wxWindows Fatal Error"),
MB_ICONERROR | MB_OK
);
return FALSE;
}
-#endif // wxUSE_UNICODE
-
- // Some people may wish to use this, but
- // probably it shouldn't be here by default.
-#ifdef __WXDEBUG__
- // wxRedirectIOToConsole();
-#endif
+#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
wxBuffer = new wxChar[1500]; // FIXME
;
#endif // Win16
+#if wxUSE_OLE
// we need to initialize OLE library
if ( FAILED(::OleInitialize(NULL)) )
wxLogError(_("Cannot initialize OLE"));
+#endif
#endif // wxUSE_OLE
LOGBRUSH lb;
lb.lbStyle = BS_PATTERN;
+ lb.lbColor = 0;
lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );
if ( lb.lbHatch )
{
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.
bool wxApp::RegisterWindowClasses()
{
WNDCLASS wndclass;
+ wxZeroMemory(wndclass);
// for each class we register one with CS_(V|H)REDRAW style and one
// without for windows created with wxNO_FULL_REDRAW_ON_REPAINT flag
// the fields which are common to all classes
wndclass.lpfnWndProc = (WNDPROC)wxWndProc;
- wndclass.cbClsExtra = 0;
- wndclass.cbWndExtra = sizeof( DWORD ); // VZ: what is this DWORD used for?
wndclass.hInstance = wxhInstance;
- wndclass.hIcon = (HICON) NULL;
wndclass.hCursor = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
- wndclass.lpszMenuName = NULL;
// Register the frame window class.
wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);
- wndclass.lpszClassName = wxFrameClassName;
+ wndclass.lpszClassName = wxCanvasClassName;
wndclass.style = styleNormal;
if ( !RegisterClass(&wndclass) )
{
wxLogLastError(wxT("RegisterClass(frame)"));
-
- return FALSE;
}
// "no redraw" frame
- wndclass.lpszClassName = wxFrameClassNameNoRedraw;
+ wndclass.lpszClassName = wxCanvasClassNameNR;
wndclass.style = styleNoRedraw;
if ( !RegisterClass(&wndclass) )
{
wxLogLastError(wxT("RegisterClass(no redraw frame)"));
-
- return FALSE;
}
// Register the MDI frame window class.
if ( !RegisterClass(&wndclass) )
{
wxLogLastError(wxT("RegisterClass(MDI parent)"));
-
- return FALSE;
}
// "no redraw" MDI frame
if ( !RegisterClass(&wndclass) )
{
wxLogLastError(wxT("RegisterClass(no redraw MDI parent frame)"));
-
- return FALSE;
}
// Register the MDI child frame window class.
if ( !RegisterClass(&wndclass) )
{
wxLogLastError(wxT("RegisterClass(MDI child)"));
-
- return FALSE;
}
// "no redraw" MDI child frame
if ( !RegisterClass(&wndclass) )
{
wxLogLastError(wxT("RegisterClass(no redraw MDI child)"));
-
- return FALSE;
- }
-
- // Register the panel window class.
- wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
- wndclass.lpszClassName = wxPanelClassName;
- wndclass.style = styleNormal;
-
- if ( !RegisterClass(&wndclass) )
- {
- wxLogLastError(wxT("RegisterClass(panel)"));
-
- return FALSE;
- }
-
- // Register the no redraw panel window class.
- wndclass.lpszClassName = wxPanelClassNameNR;
- wndclass.style = styleNoRedraw;
-
- if ( !RegisterClass(&wndclass) )
- {
- wxLogLastError(wxT("RegisterClass(no redraw panel)"));
-
- return FALSE;
- }
-
- // Register the canvas and textsubwindow class name
- wndclass.hbrBackground = (HBRUSH)NULL;
- wndclass.lpszClassName = wxCanvasClassName;
-
- if ( !RegisterClass(&wndclass) )
- {
- wxLogLastError(wxT("RegisterClass(canvas)"));
-
- return FALSE;
- }
-
- wndclass.lpszClassName = wxCanvasClassNameNR;
- wndclass.style = styleNoRedraw;
- if ( !RegisterClass(&wndclass) )
- {
- wxLogLastError(wxT("RegisterClass(no redraw canvas)"));
-
- return FALSE;
}
return TRUE;
{
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;
- }
-
+#ifndef __WXMICROWIN__
// MDI frame window class.
- if ( !UnregisterClass(wxMDIFrameClassName, wxhInstance) )
+ if ( !::UnregisterClass(wxMDIFrameClassName, wxhInstance) )
{
wxLogLastError(wxT("UnregisterClass(MDI parent)"));
}
// "no redraw" MDI frame
- if ( !UnregisterClass(wxMDIFrameClassNameNoRedraw, wxhInstance) )
+ if ( !::UnregisterClass(wxMDIFrameClassNameNoRedraw, wxhInstance) )
{
wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)"));
}
// MDI child frame window class.
- if ( !UnregisterClass(wxMDIChildFrameClassName, wxhInstance) )
+ if ( !::UnregisterClass(wxMDIChildFrameClassName, wxhInstance) )
{
wxLogLastError(wxT("UnregisterClass(MDI child)"));
}
// "no redraw" MDI child frame
- if ( !UnregisterClass(wxMDIChildFrameClassNameNoRedraw, wxhInstance) )
+ 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) )
+ // canvas class name
+ if ( !::UnregisterClass(wxCanvasClassName, wxhInstance) )
{
wxLogLastError(wxT("UnregisterClass(canvas)"));
retval = FALSE;
}
- if ( !UnregisterClass(wxCanvasClassNameNR, wxhInstance) )
+ if ( !::UnregisterClass(wxCanvasClassNameNR, wxhInstance) )
{
wxLogLastError(wxT("UnregisterClass(no redraw canvas)"));
retval = FALSE;
}
+#endif // __WXMICROWIN__
return retval;
}
// Convert Windows to argc, argv style
// ---------------------------------------------------------------------------
-void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
+void wxApp::ConvertToStandardCommandArgs(const char* lpCmdLine)
{
- wxStringList args;
+ // break the command line in words
+ wxArrayString args =
+ wxCmdLineParser::ConvertStringToArgs(wxConvertMB2WX(lpCmdLine));
- wxString cmdLine(lpCmdLine);
- int count = 0;
+ // +1 here for the program name
+ argc = args.GetCount() + 1;
- // Get application name
- wxChar name[260]; // 260 is MAX_PATH value from windef.h
- ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
+ // and +1 here for the terminating NULL
+ argv = new wxChar *[argc + 1];
- args.Add(name);
- count++;
+ argv[0] = new wxChar[260]; // 260 is MAX_PATH value from windef.h
+ ::GetModuleFileName(wxhInstance, argv[0], 260);
- wxStrcpy(name, wxFileNameFromPath(name));
- wxStripExtension(name);
- wxTheApp->SetAppName(name);
+ // also set the app name from argv[0]
+ wxString name;
+ wxFileName::SplitPath(argv[0], NULL, &name, NULL);
- // Break up string
- // Treat strings enclosed in double-quotes as single arguments
- int i = 0;
- int len = cmdLine.Length();
- while (i < len)
- {
- // Skip whitespace
- while ((i < len) && wxIsspace(cmdLine.GetChar(i)))
- i ++;
+ // but don't override the name already set by the user code, if any
+ if ( GetAppName().empty() )
+ SetAppName(name);
- if (i < len)
- {
- if (cmdLine.GetChar(i) == wxT('"')) // We found the start of a string
- {
- i ++;
- int first = i;
- while ((i < len) && (cmdLine.GetChar(i) != wxT('"')))
- i ++;
-
- wxString arg(cmdLine.Mid(first, (i - first)));
-
- args.Add(arg);
- count ++;
-
- if (i < len)
- i ++; // Skip past 2nd quote
- }
- else // Unquoted argument
- {
- int first = i;
- while ((i < len) && !wxIsspace(cmdLine.GetChar(i)))
- i ++;
-
- wxString arg(cmdLine.Mid(first, (i - first)));
-
- args.Add(arg);
- count ++;
- }
- }
- }
-
- wxTheApp->argv = new wxChar*[count + 1];
- for (i = 0; i < count; i++)
+ // copy all the other arguments to wxApp::argv[]
+ for ( int i = 1; i < argc; i++ )
{
- wxString arg(args[i]);
- wxTheApp->argv[i] = copystring((const wxChar*)arg);
+ argv[i] = copystring(args[i - 1]);
}
- wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list
- wxTheApp->argc = count;
+
+ // argv[] must be NULL-terminated
+ argv[argc] = NULL;
}
//// Cleans up any wxWindows internal structures left lying around
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.
wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
// save the WinMain() parameters
- wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
+ if (lpCmdLine) // MicroWindows passes NULL
+ wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
wxTheApp->m_nCmdShow = nCmdShow;
// 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.
#ifdef __VISUALC__
+#if wxUSE_LOG
wxLog::SetTimestamp(NULL);
-#endif
-
- int retValue = 0;
-
- // it is common to create a modal dialog in OnInit() (to ask/notify the
- // user about something) but it wouldn't work if we don't change the
- // "exit on delete last frame" flag here as when this dialog is
- // deleted, the app would terminate (it was the last top level window
- // as the main frame wasn't created yet!), so disable this behaviour
- // temproarily
- bool exitOnLastFrameDelete = wxTheApp->GetExitOnFrameDelete();
- wxTheApp->SetExitOnFrameDelete(FALSE);
+#endif // wxUSE_LOG
+#endif // __VISUALC__
// init the app
- retValue = wxEntryInitGui() && wxTheApp->OnInit() ? 0 : -1;
-
- // restore the old flag value
- wxTheApp->SetExitOnFrameDelete(exitOnLastFrameDelete);
+ int retValue = wxEntryInitGui() && wxTheApp->OnInit() ? 0 : -1;
if ( retValue == 0 )
{
if ( enterLoop )
{
// run the main loop
- retValue = wxTheApp->OnRun();
+ wxTheApp->OnRun();
}
else
{
}
}
- wxTheApp->OnExit();
+ retValue = wxTheApp->OnExit();
wxEntryCleanup();
{
s_hadGuiLock = TRUE;
- size_t count = s_aSavedMessages.Count();
+ size_t count = s_aSavedMessages.GetCount();
for ( size_t n = 0; n < count; n++ )
{
MSG& msg = s_aSavedMessages[n];
- if ( !ProcessMessage((WXMSG *)&msg) )
- {
- ::TranslateMessage(&msg);
- ::DispatchMessage(&msg);
- }
+ DoMessage((WXMSG *)&msg);
}
s_aSavedMessages.Empty();
void wxApp::ExitMainLoop()
{
- // VZ: why not ::PostQuitMessage()?
- m_keepGoing = FALSE;
+ // this will set m_keepGoing to FALSE a bit later
+ ::PostQuitMessage(0);
}
bool wxApp::Pending()
// 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
return FALSE;
}
+// this is a temporary hack and will be replaced by using wxEventLoop in the
+// future
+//
+// it is needed to allow other event loops (currently only one: the modal
+// dialog one) to reset the OnIdle() semaphore because otherwise OnIdle()
+// wouldn't do anything while a modal dialog shown from OnIdle() call is shown.
+bool wxIsInOnIdleFlag = FALSE;
+
void wxApp::OnIdle(wxIdleEvent& event)
{
- static bool s_inOnIdle = FALSE;
-
// Avoid recursion (via ProcessEvent default case)
- if ( s_inOnIdle )
+ if ( wxIsInOnIdleFlag )
return;
- s_inOnIdle = TRUE;
+ wxIsInOnIdleFlag = TRUE;
// If there are pending events, we must process them: pending events
// are either events to the threads other than main or events posted
event.RequestMore(TRUE);
}
- s_inOnIdle = FALSE;
+ wxIsInOnIdleFlag = FALSE;
}
// Send idle event to all top-level windows
// Send idle event to window and all subwindows
bool wxApp::SendIdleEvents(wxWindow* win)
{
- bool needMore = FALSE;
-
wxIdleEvent event;
event.SetEventObject(win);
win->GetEventHandler()->ProcessEvent(event);
- if (event.MoreRequested())
- needMore = TRUE;
+ bool needMore = event.MoreRequested();
- wxNode* node = win->GetChildren().First();
- while (node)
+ wxWindowList::Node *node = win->GetChildren().GetFirst();
+ while ( node )
{
- wxWindow* win = (wxWindow*) node->Data();
+ wxWindow *win = node->GetData();
if (SendIdleEvents(win))
needMore = TRUE;
- node = node->Next();
+ node = node->GetNext();
}
+
return needMore;
}
void wxApp::DeletePendingObjects()
{
- wxNode *node = wxPendingDelete.First();
+ wxNode *node = wxPendingDelete.GetFirst();
while (node)
{
- wxObject *obj = (wxObject *)node->Data();
+ wxObject *obj = node->GetData();
delete obj;
// Deleting one object may have deleted other pending
// objects, so start from beginning of list again.
- node = wxPendingDelete.First();
+ node = wxPendingDelete.GetFirst();
}
}
// Yield to incoming messages
-static bool gs_inYield = FALSE;
-
-bool wxYield()
+bool wxApp::Yield(bool onlyIfNeeded)
{
+ // MT-FIXME
+ static bool s_inYield = FALSE;
+
+#if wxUSE_LOG
// disable log flushing from here because a call to wxYield() shouldn't
// normally result in message boxes popping up &c
wxLog::Suspend();
+#endif // wxUSE_LOG
-#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();
+#if wxUSE_LOG
// let the logs be flashed again
wxLog::Resume();
+#endif // wxUSE_LOG
- 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
}
//-----------------------------------------------------------------------------
-wxIcon
-wxApp::GetStdIcon(int which) const
-{
- switch(which)
- {
- case wxICON_INFORMATION:
- return wxIcon("wxICON_INFO");
-
- case wxICON_QUESTION:
- return wxIcon("wxICON_QUESTION");
-
- case wxICON_EXCLAMATION:
- return wxIcon("wxICON_WARNING");
-
- default:
- wxFAIL_MSG(wxT("requested non existent standard icon"));
- // still fall through
-
- case wxICON_HAND:
- return wxIcon("wxICON_ERROR");
- }
-}
-
// For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
// if in a separate file. So include it here to ensure it's linked.
-#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__) && !defined(WXMAKINGDLL))
+#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__WINE__) && !defined(__TWIN32__) && !defined(WXMAKINGDLL))
#include "main.cpp"
#endif
projects / wxWidgets.git / blobdiff