/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "app.h"
+ #pragma implementation "app.h"
#endif
#include "wx/app.h"
#include "wx/font.h"
#include "wx/settings.h"
#include "wx/dialog.h"
+
#if wxUSE_WX_RESOURCES
-#include "wx/resource.h"
+ #include "wx/resource.h"
#endif
+
#include "wx/module.h"
#include "wx/image.h"
-#if wxUSE_THREADS
+
#include "wx/thread.h"
-#endif
+
#include "unistd.h"
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <glib.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
#include "wx/gtk/win_gtk.h"
//-----------------------------------------------------------------------------
wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
extern wxList wxPendingDelete;
+#if wxUSE_THREADS
+extern wxList *wxPendingEvents;
+extern wxCriticalSection *wxPendingEventsLocker;
+#endif
extern wxResourceCache *wxTheResourceCache;
unsigned char g_palette[64*3] =
// global functions
//-----------------------------------------------------------------------------
-void wxExit(void)
+void wxExit()
{
gtk_main_quit();
}
-bool wxYield(void)
+// forward decl
+gint wxapp_idle_callback( gpointer WXUNUSED(data) );
+
+bool wxYield()
{
- while (gtk_events_pending() > 0) gtk_main_iteration();
+ // it's necessary to call ProcessIdle() to update the frames sizes which
+ // might have been changed (it also will update other things set from
+ // OnUpdateUI() which is a nice (and desired) side effect)
+ for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
+ node;
+ node = node->GetNext() )
+ {
+ wxWindow *win = node->GetData();
+ win->OnInternalIdle();
+ }
+
+ // We need to temporarily remove idle callbacks or the loop will
+ // never finish.
+ gtk_idle_remove( wxTheApp->m_idleTag );
+
+ while (gtk_events_pending())
+ gtk_main_iteration();
+
+ wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
return TRUE;
}
gint wxapp_idle_callback( gpointer WXUNUSED(data) )
{
- if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
-#if wxUSE_THREADS
+ if (wxTheApp)
+ {
+ while (wxTheApp->ProcessIdle())
+ {
+ }
+ }
+
wxMutexGuiLeave();
-#endif
- usleep(10000);
-#if wxUSE_THREADS
+ wxUsleep(10);
wxMutexGuiEnter();
-#endif
+
return TRUE;
}
wxApp::wxApp()
{
wxTheApp = this;
-
+
m_topWindow = (wxWindow *) NULL;
m_exitOnFrameDelete = TRUE;
-
+
m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
-
+
m_colorCube = (unsigned char*) NULL;
}
-wxApp::~wxApp(void)
+wxApp::~wxApp()
{
gtk_idle_remove( m_idleTag );
-
+
if (m_colorCube) free(m_colorCube);
}
GdkVisual *visual = gdk_visual_get_system();
if (visual->depth > 8) return TRUE;
-
+
/* this initiates the standard palette as defined by GdkImlib
in the GNOME libraries. it ensures that all GNOME applications
use the same 64 colormap entries on 8-bit displays so you
can use several rather graphics-heavy applications at the
same time.
- NOTE: this doesn't really seem to work this way... */
+ NOTE: this doesn't really seem to work this way... */
/*
GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
gdk_color_alloc( cmap, &col );
}
-
+
gtk_widget_set_default_colormap( cmap );
*/
-
+
/* initialize color cube for 8-bit color reduction dithering */
-
+
GdkColormap *cmap = gtk_widget_get_default_colormap();
-
+
m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
for (int r = 0; r < 32; r++)
{
- for (int g = 0; g < 32; g++)
- {
- for (int b = 0; b < 32; b++)
- {
- int rr = (r << 3) | (r >> 2);
- int gg = (g << 3) | (g >> 2);
- int bb = (b << 3) | (b >> 2);
-
+ for (int g = 0; g < 32; g++)
+ {
+ for (int b = 0; b < 32; b++)
+ {
+ int rr = (r << 3) | (r >> 2);
+ int gg = (g << 3) | (g >> 2);
+ int bb = (b << 3) | (b >> 2);
+
GdkColor *colors = cmap->colors;
int max = 3 * (65536);
int index = -1;
int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
if (sum < max) { index = i; max = sum; }
}
-
- m_colorCube[ (r*1024) + (g*32) + b ] = index;
- }
- }
+
+ m_colorCube[ (r*1024) + (g*32) + b ] = index;
+ }
+ }
}
-
+
return TRUE;
}
-bool wxApp::ProcessIdle(void)
+bool wxApp::ProcessIdle()
{
wxIdleEvent event;
event.SetEventObject( this );
inOnIdle = TRUE;
+#if wxUSE_THREADS
+ /* Resend in the main thread events which have been prepared in other
+ threads */
+ ProcessPendingEvents();
+#endif
+
/* 'Garbage' collection of windows deleted with Close(). */
DeletePendingObjects();
inOnIdle = FALSE;
}
-bool wxApp::SendIdleEvents(void)
+bool wxApp::SendIdleEvents()
{
bool needMore = FALSE;
- wxNode* node = wxTopLevelWindows.First();
+ wxWindowList::Node* node = wxTopLevelWindows.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;
}
wxIdleEvent event;
event.SetEventObject(win);
+
+ win->OnInternalIdle();
+
win->ProcessEvent(event);
if (event.MoreRequested())
return needMore ;
}
-int wxApp::MainLoop(void)
+int wxApp::MainLoop()
{
gtk_main();
return 0;
}
-void wxApp::ExitMainLoop(void)
+void wxApp::ExitMainLoop()
{
gtk_main_quit();
}
-bool wxApp::Initialized(void)
+bool wxApp::Initialized()
{
return m_initialized;
}
-bool wxApp::Pending(void)
+bool wxApp::Pending()
+{
+ return gtk_events_pending();
+}
+
+void wxApp::Dispatch()
{
- return FALSE;
+ gtk_main_iteration();
}
-void wxApp::Dispatch(void)
+#if wxUSE_THREADS
+void wxApp::ProcessPendingEvents()
{
+ wxNode *node = wxPendingEvents->First();
+ wxCriticalSectionLocker locker(*wxPendingEventsLocker);
+
+ while (node)
+ {
+ wxEvtHandler *handler = (wxEvtHandler *)node->Data();
+
+ handler->ProcessPendingEvents();
+
+ delete node;
+
+ node = wxPendingEvents->First();
+ }
}
+#endif // wxUSE_THREADS
-void wxApp::DeletePendingObjects(void)
+void wxApp::DeletePendingObjects()
{
wxNode *node = wxPendingDelete.First();
while (node)
}
}
-wxWindow *wxApp::GetTopWindow(void)
+wxWindow *wxApp::GetTopWindow()
{
- if (m_topWindow) return m_topWindow;
- wxNode *node = wxTopLevelWindows.First();
- if (!node) return (wxWindow *) NULL;
- return (wxWindow*)node->Data();
+ if (m_topWindow)
+ return m_topWindow;
+ else if (wxTopLevelWindows.GetCount() > 0)
+ return wxTopLevelWindows.GetFirst()->GetData();
+ else
+ return NULL;
}
void wxApp::SetTopWindow( wxWindow *win )
m_topWindow = win;
}
-bool wxApp::Initialize(void)
+bool wxApp::Initialize()
{
- wxBuffer = new char[BUFSIZ + 512];
+ wxBuffer = new wxChar[BUFSIZ + 512];
wxClassInfo::InitializeClasses();
-
+
wxSystemSettings::Init();
-
+
+ // 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.
+#if wxUSE_THREADS
+ wxPendingEvents = new wxList();
+ wxPendingEventsLocker = new wxCriticalSection();
+#endif
+
+/*
wxTheFontNameDirectory = new wxFontNameDirectory;
wxTheFontNameDirectory->Initialize();
+*/
wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
wxTheColourDatabase->Initialize();
#if wxUSE_WX_RESOURCES
wxTheResourceCache = new wxResourceCache( wxKEY_STRING );
-
+
wxInitializeResourceSystem();
#endif
/* no global cursor under X
g_globalCursor = new wxCursor; */
-
+
wxModule::RegisterModules();
if (!wxModule::InitializeModules()) return FALSE;
-
+
return TRUE;
}
-void wxApp::CleanUp(void)
+void wxApp::CleanUp()
{
wxModule::CleanUpModules();
#if wxUSE_WX_RESOURCES
wxFlushResources();
- if (wxTheResourceCache) delete wxTheResourceCache;
+ if (wxTheResourceCache)
+ delete wxTheResourceCache;
wxTheResourceCache = (wxResourceCache*) NULL;
-
+
wxCleanUpResourceSystem();
#endif
- if (wxTheColourDatabase) delete wxTheColourDatabase;
+ if (wxTheColourDatabase)
+ delete wxTheColourDatabase;
wxTheColourDatabase = (wxColourDatabase*) NULL;
-
+
+/*
if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;
-
+*/
+
wxDeleteStockObjects();
wxDeleteStockLists();
delete wxTheApp;
wxTheApp = (wxApp*) NULL;
- /* check for memory leaks */
+ // 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.
+#if wxUSE_THREADS
+ delete wxPendingEvents;
+ delete wxPendingEventsLocker;
+#endif
+
+ wxSystemSettings::Done();
+
+ delete[] wxBuffer;
+
+ wxClassInfo::CleanUpClasses();
+
+ // check for memory leaks
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
if (wxDebugContext::CountObjectsLeft() > 0)
{
- wxLogDebug("There were memory leaks.\n");
+ wxLogDebug(_T("There were memory leaks.\n"));
wxDebugContext::Dump();
wxDebugContext::PrintStatistics();
}
-#endif
+#endif // Debug
- /* do this as the very last thing because everything else can log messages */
+ // do this as the very last thing because everything else can log messages
wxLog::DontCreateOnDemand();
-
- wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
- if (oldLog) delete oldLog;
- wxSystemSettings::Done();
-
- wxClassInfo::CleanUpClasses();
-
- delete[] wxBuffer;
+ wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
+ if (oldLog)
+ delete oldLog;
}
wxLog *wxApp::CreateLogTarget()
gtk_init( &argc, &argv );
- if (!wxApp::Initialize()) return 0;
+ if (!wxApp::Initialize())
+ return -1;
if (!wxTheApp)
{
- if (!wxApp::GetInitializerFunction())
- {
- printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
- return 0;
- }
+ wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
+ _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
wxTheApp = (wxApp*) test_app;
}
- if (!wxTheApp)
- {
- printf( "wxWindows error: wxTheApp == NULL\n" );
- return 0;
- }
+ wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") );
wxTheApp->argc = argc;
wxTheApp->argv = argv;
- char name[200];
- strcpy( name, argv[0] );
- strcpy( name, wxFileNameFromPath(name) );
+ wxString name(wxFileNameFromPath(argv[0]));
wxStripExtension( name );
wxTheApp->SetAppName( name );
- if (!wxTheApp->OnInitGui()) return 0;
-
- /* Here frames insert themselves automatically
- * into wxTopLevelWindows by getting created
- * in OnInit(). */
+ int retValue = 0;
- if (!wxTheApp->OnInit()) return 0;
+ if ( !wxTheApp->OnInitGui() )
+ retValue = -1;
- wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
+ // Here frames insert themselves automatically into wxTopLevelWindows by
+ // getting created in OnInit().
+ if ( retValue == 0 )
+ {
+ if ( !wxTheApp->OnInit() )
+ retValue = -1;
+ }
- int retValue = 0;
+ if ( retValue == 0 )
+ {
+ wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
- if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
+ if (wxTheApp->Initialized())
+ retValue = wxTheApp->OnRun();
- wxWindow *topWindow = wxTheApp->GetTopWindow();
- if (topWindow)
- {
- /* Forcibly delete the window. */
- if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
- topWindow->IsKindOf(CLASSINFO(wxDialog)) )
+ wxWindow *topWindow = wxTheApp->GetTopWindow();
+ if (topWindow)
{
- topWindow->Close( TRUE );
- wxTheApp->DeletePendingObjects();
+ // Forcibly delete the window.
+ if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
+ topWindow->IsKindOf(CLASSINFO(wxDialog)) )
+ {
+ topWindow->Close( TRUE );
+ wxTheApp->DeletePendingObjects();
+ }
+ else
+ {
+ delete topWindow;
+ wxTheApp->SetTopWindow( (wxWindow*) NULL );
+ }
}
- else
- {
- delete topWindow;
- wxTheApp->SetTopWindow( (wxWindow*) NULL );
- }
- }
- wxTheApp->OnExit();
+ wxTheApp->OnExit();
+ }
- /* flush the logged messages if any */
+ // flush the logged messages if any
wxLog *log = wxLog::GetActiveTarget();
if (log != NULL && log->HasPendingMessages())
log->Flush();
+ // continuing to use user defined log target is unsafe from now on because
+ // some resources may be already unavailable, so replace it by something
+ // more safe
+ wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
+ if ( oldlog )
+ delete oldlog;
+
wxApp::CleanUp();
return retValue;
projects / wxWidgets.git / blobdiff