// headers
// ---------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "appbase.h"
#endif
#ifndef WX_PRECOMP
#include "wx/app.h"
+ #include "wx/bitmap.h"
#include "wx/intl.h"
#include "wx/list.h"
#include "wx/log.h"
#include "wx/msgdlg.h"
+ #include "wx/bitmap.h"
+ #include "wx/confbase.h"
#endif
#include "wx/apptrait.h"
-#if wxUSE_FONTMAP
- #include "wx/fontmap.h"
-#endif // wxUSE_FONTMAP
+#include "wx/cmdline.h"
#include "wx/msgout.h"
#include "wx/thread.h"
#include "wx/utils.h"
+#if defined(__WXMSW__)
+ #include "wx/msw/private.h" // includes windows.h for LOGFONT
+#endif
+
+#if wxUSE_FONTMAP
+ #include "wx/fontmap.h"
+#endif // wxUSE_FONTMAP
+
+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxCore")
+
// ============================================================================
// wxAppBase implementation
// ============================================================================
m_exitOnFrameDelete = Later;
}
-bool wxAppBase::Initialize(int argc, wxChar **argv)
+bool wxAppBase::Initialize(int& argc, wxChar **argv)
{
if ( !wxAppConsole::Initialize(argc, argv) )
return false;
- // for compatibility call the old initialization function too
- if ( !OnInitGui() )
- {
- wxAppConsole::CleanUp();
-
- return false;
- }
-
#if wxUSE_THREADS
wxPendingEventsLocker = new wxCriticalSection;
#endif
- wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
- wxTheColourDatabase->Initialize();
-
wxInitializeStockLists();
wxInitializeStockObjects();
delete wxPendingEventsLocker;
wxPendingEventsLocker = NULL;
-#if wxUSE_VALIDATORS
- // If we don't do the following, we get an apparent memory leak.
- ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
-#endif // wxUSE_VALIDATORS
+ #if wxUSE_VALIDATORS
+ // If we don't do the following, we get an apparent memory leak.
+ ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
+ #endif // wxUSE_VALIDATORS
#endif // wxUSE_THREADS
}
+#if wxUSE_CMDLINE_PARSER
+
+// ----------------------------------------------------------------------------
+// GUI-specific command line options handling
+// ----------------------------------------------------------------------------
+
+#define OPTION_THEME _T("theme")
+#define OPTION_MODE _T("mode")
+
+void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
+{
+ // first add the standard non GUI options
+ wxAppConsole::OnInitCmdLine(parser);
+
+ // the standard command line options
+ static const wxCmdLineEntryDesc cmdLineGUIDesc[] =
+ {
+#ifdef __WXUNIVERSAL__
+ {
+ wxCMD_LINE_OPTION,
+ _T(""),
+ OPTION_THEME,
+ gettext_noop("specify the theme to use"),
+ wxCMD_LINE_VAL_STRING,
+ 0x0
+ },
+#endif // __WXUNIVERSAL__
+
+#if defined(__WXMGL__)
+ // VS: this is not specific to wxMGL, all fullscreen (framebuffer) ports
+ // should provide this option. That's why it is in common/appcmn.cpp
+ // and not mgl/app.cpp
+ {
+ wxCMD_LINE_OPTION,
+ _T(""),
+ OPTION_MODE,
+ gettext_noop("specify display mode to use (e.g. 640x480-16)"),
+ wxCMD_LINE_VAL_STRING,
+ 0x0
+ },
+#endif // __WXMGL__
+
+ // terminator
+ {
+ wxCMD_LINE_NONE,
+ _T(""),
+ _T(""),
+ _T(""),
+ wxCMD_LINE_VAL_NONE,
+ 0x0
+ }
+ };
+
+ parser.SetDesc(cmdLineGUIDesc);
+}
+
+bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
+{
+#ifdef __WXUNIVERSAL__
+ wxString themeName;
+ if ( parser.Found(OPTION_THEME, &themeName) )
+ {
+ wxTheme *theme = wxTheme::Create(themeName);
+ if ( !theme )
+ {
+ wxLogError(_("Unsupported theme '%s'."), themeName.c_str());
+ return FALSE;
+ }
+
+ // Delete the defaultly created theme and set the new theme.
+ delete wxTheme::Get();
+ wxTheme::Set(theme);
+ }
+#endif // __WXUNIVERSAL__
+
+#if defined(__WXMGL__)
+ wxString modeDesc;
+ if ( parser.Found(OPTION_MODE, &modeDesc) )
+ {
+ unsigned w, h, bpp;
+ if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
+ {
+ wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
+ return FALSE;
+ }
+
+ if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) )
+ return FALSE;
+ }
+#endif // __WXMGL__
+
+ return wxAppConsole::OnCmdLineParsed(parser);
+}
+
+#endif // wxUSE_CMDLINE_PARSER
+
// ----------------------------------------------------------------------------
// OnXXX() hooks
// ----------------------------------------------------------------------------
return MainLoop();
}
+int wxAppBase::OnExit()
+{
+#ifdef __WXUNIVERSAL__
+ delete wxTheme::Set(NULL);
+#endif // __WXUNIVERSAL__
+
+ return wxAppConsole::OnExit();
+}
+
void wxAppBase::Exit()
{
ExitMainLoop();
wxAppTraits *wxAppBase::CreateTraits()
{
- return wxAppTraits::CreateGUI();
+ return new wxGUIAppTraits;
}
// ----------------------------------------------------------------------------
void wxAppBase::DeletePendingObjects()
{
- wxNode *node = wxPendingDelete.GetFirst();
+ wxList::compatibility_iterator node = wxPendingDelete.GetFirst();
while (node)
{
wxObject *obj = node->GetData();
delete obj;
if (wxPendingDelete.Member(obj))
- delete node;
+ wxPendingDelete.Erase(node);
// Deleting one object may have deleted other pending
// objects, so start from beginning of list again.
}
}
+// Returns TRUE if more time is needed.
+bool wxAppBase::ProcessIdle()
+{
+ wxIdleEvent event;
+ bool needMore = FALSE;
+ wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
+ while (node)
+ {
+ wxWindow* win = node->GetData();
+ if (SendIdleEvents(win, event))
+ needMore = TRUE;
+ node = node->GetNext();
+ }
+
+ event.SetEventObject(this);
+ (void) ProcessEvent(event);
+ if (event.MoreRequested())
+ needMore = TRUE;
+
+ wxUpdateUIEvent::ResetUpdateTime();
+
+ return needMore;
+}
+
+// Send idle event to window and all subwindows
+bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
+{
+ bool needMore = FALSE;
+
+ win->OnInternalIdle();
+
+ if (wxIdleEvent::CanSend(win))
+ {
+ event.SetEventObject(win);
+ win->GetEventHandler()->ProcessEvent(event);
+
+ if (event.MoreRequested())
+ needMore = TRUE;
+ }
+ wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
+ while ( node )
+ {
+ wxWindow *child = node->GetData();
+ if (SendIdleEvents(child, event))
+ needMore = TRUE;
+
+ node = node->GetNext();
+ }
+
+ return needMore;
+}
+
+void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event))
+{
+ // If there are pending events, we must process them: pending events
+ // are either events to the threads other than main or events posted
+ // with wxPostEvent() functions
+ // GRG: I have moved this here so that all pending events are processed
+ // before starting to delete any objects. This behaves better (in
+ // particular, wrt wxPostEvent) and is coherent with wxGTK's current
+ // behaviour. Changed Feb/2000 before 2.1.14
+ ProcessPendingEvents();
+
+ // 'Garbage' collection of windows deleted with Close().
+ DeletePendingObjects();
+
+#if wxUSE_LOG
+ // flush the logged messages if any
+ wxLog::FlushActive();
+#endif // wxUSE_LOG
+
+}
+
// ----------------------------------------------------------------------------
// wxGUIAppTraitsBase
// ----------------------------------------------------------------------------
#endif // wxUSE_FONTMAP
+wxRendererNative *wxGUIAppTraitsBase::CreateRenderer()
+{
+ // use the default native renderer by default
+ return NULL;
+}
+
#ifdef __WXDEBUG__
bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
wxPendingDelete.DeleteObject(object);
}
-// ----------------------------------------------------------------------------
-// wxAppTraits
-// ----------------------------------------------------------------------------
+#if wxUSE_SOCKETS
+
+#if defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__)
+ #include "wx/unix/gsockunx.h"
+#elif defined(__WINDOWS__)
+ #include "wx/msw/gsockmsw.h"
+#elif defined(__WXMAC__)
+ #include <MacHeaders.c>
+ #define OTUNIXERRORS 1
+ #include <OpenTransport.h>
+ #include <OpenTransportProviders.h>
+ #include <OpenTptInternet.h>
+
+ #include "wx/mac/gsockmac.h"
+#else
+ #error "Must include correct GSocket header here"
+#endif
-wxAppTraits *wxAppTraitsBase::CreateGUI()
+GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
{
- return new wxGUIAppTraits;
+#ifdef __WXMAC__
+ // NB: wxMac does not have any GUI-specific functions in gsocket.c and
+ // so it doesn't need this table at all
+ return NULL;
+#else // !__WXMAC__
+ static GSocketGUIFunctionsTable table =
+ {
+ _GSocket_GUI_Init,
+ _GSocket_GUI_Cleanup,
+ _GSocket_GUI_Init_Socket,
+ _GSocket_GUI_Destroy_Socket,
+#ifndef __WINDOWS__
+ _GSocket_Install_Callback,
+ _GSocket_Uninstall_Callback,
+#endif
+ _GSocket_Enable_Events,
+ _GSocket_Disable_Events
+ };
+ return &table;
+#endif // __WXMAC__/!__WXMAC__
}
+#endif
+
projects / wxWidgets.git / blobdiff