X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcf924a345ea8ffbc1cf6b40b5f75c6005e504c0..bb69661b050ad2c774985e225cce0e497a875143:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 1dd8ad95af..a690ab53a4 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -8,6 +8,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ + #pragma implementation "appbase.h" #pragma implementation "app.h" #endif @@ -45,7 +46,7 @@ //----------------------------------------------------------------------------- wxApp *wxTheApp = (wxApp *) NULL; -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; #if wxUSE_THREADS extern wxList *wxPendingEvents; @@ -146,7 +147,7 @@ bool wxYield() might have been changed (it also will update other things set from OnUpdateUI() which is a nice (and desired) side effect) */ while (wxTheApp->ProcessIdle()) { } - + #if 0 for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst(); node; @@ -175,24 +176,24 @@ bool wxYield() while (gtk_events_pending()) gtk_main_iteration(); } - + return TRUE; } gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { if (!wxTheApp) return TRUE; - + #if (GTK_MINOR_VERSION > 0) /* when getting called from GDK's idle handler we are no longer within GDK's grab on the GUI thread so we must lock it here ourselves */ GDK_THREADS_ENTER (); #endif - + /* sent idle event to all who request them */ while (wxTheApp->ProcessIdle()) { } - + /* we don't want any more idle events until the next event is sent to wxGTK */ gtk_idle_remove( wxTheApp->m_idleTag ); @@ -204,7 +205,7 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) ) once each time after the event queue has been completely emptied */ g_isIdle = TRUE; - + #if (GTK_MINOR_VERSION > 0) /* release lock again */ GDK_THREADS_LEAVE (); @@ -221,42 +222,44 @@ void wxapp_install_idle_handler() indicating that the idle is over. */ wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); - + g_isIdle = FALSE; } +/* #if wxUSE_THREADS static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ) { gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag ); wxTheApp->m_wakeUpTimerTag = 0; - + #if (GTK_MINOR_VERSION > 0) - /* when getting called from GDK's time-out handler - we are no longer within GDK's grab on the GUI - thread so we must lock it here ourselves */ + // when getting called from GDK's time-out handler + // we are no longer within GDK's grab on the GUI + // thread so we must lock it here ourselves GDK_THREADS_ENTER (); #endif - - /* unblock other threads wishing to do some GUI things */ + + // unblock other threads wishing to do some GUI things wxMutexGuiLeave(); - - /* wake up other threads */ + + // wake up other threads wxUsleep( 1 ); - - /* block other thread again */ + + // block other thread again wxMutexGuiEnter(); - + #if (GTK_MINOR_VERSION > 0) - /* release lock again */ + // release lock again GDK_THREADS_LEAVE (); #endif - + wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL ); - + return TRUE; } #endif +*/ //----------------------------------------------------------------------------- // wxApp @@ -276,10 +279,12 @@ wxApp::wxApp() m_exitOnFrameDelete = TRUE; m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); - + +/* #if wxUSE_THREADS m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL ); #endif +*/ m_colorCube = (unsigned char*) NULL; } @@ -288,18 +293,36 @@ wxApp::~wxApp() { if (m_idleTag) gtk_idle_remove( m_idleTag ); +/* #if wxUSE_THREADS if (m_wakeUpTimerTag) gtk_timeout_remove( m_wakeUpTimerTag ); #endif - +*/ + if (m_colorCube) free(m_colorCube); } bool wxApp::OnInitGui() { - /* Nothing to do for 15, 16, 24, 32 bit displays */ - GdkVisual *visual = gdk_visual_get_system(); + + /* on some machines, the default visual is just 256 colours, so + we make sure we get the best. this can sometimes be wasteful, + of course, but what do these guys pay $30.000 for? */ +/* + if (gdk_visual_get_best() != gdk_visual_get_system()) + { + GdkVisual* vis = gdk_visual_get_best(); + gtk_widget_set_default_visual( vis ); + + GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); + gtk_widget_set_default_colormap( colormap ); + + visual = vis; + } +*/ + + /* Nothing to do for 15, 16, 24, 32 bit displays */ if (visual->depth > 8) return TRUE; /* this initiates the standard palette as defined by GdkImlib @@ -356,21 +379,24 @@ bool wxApp::OnInitGui() int bdiff = ((bb << 8) - colors[i].blue); int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff); if (sum < max) - { + { index = i; max = sum; } } } - else - { - /* assume 8-bit true or static colors. this really - exists. */ - GdkVisual* vis = gdk_colormap_get_visual( cmap ); - index = (r >> (5 - vis->red_prec)) << vis->red_shift; - index |= (g >> (5 - vis->green_prec)) << vis->green_shift; - index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift; - } - + else + { +#if (GTK_MINOR_VERSION > 0) + /* assume 8-bit true or static colors. this really + exists. */ + GdkVisual* vis = gdk_colormap_get_visual( cmap ); + index = (r >> (5 - vis->red_prec)) << vis->red_shift; + index |= (g >> (5 - vis->green_prec)) << vis->green_shift; + index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift; +#else + wxFAIL_MSG( _T("Unsupported graphics hardware") ); +#endif + } m_colorCube[ (r*1024) + (g*32) + b ] = index; } } @@ -526,21 +552,6 @@ void wxApp::DeletePendingObjects() } } -wxWindow *wxApp::GetTopWindow() -{ - 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() { wxBuffer = new wxChar[BUFSIZ + 512]; @@ -575,9 +586,6 @@ bool wxApp::Initialize() wxImage::InitStandardHandlers(); - /* no global cursor under X - g_globalCursor = new wxCursor; */ - wxModule::RegisterModules(); if (!wxModule::InitializeModules()) return FALSE; @@ -648,10 +656,6 @@ void wxApp::CleanUp() delete oldLog; } -wxLog *wxApp::CreateLogTarget() -{ - return new wxLogGui; -} #endif // wxUSE_LOG //----------------------------------------------------------------------------- @@ -667,7 +671,7 @@ int wxEntry( int argc, char *argv[] ) gtk_init( &argc, &argv ); wxSetDetectableAutoRepeat( TRUE ); - + if (!wxApp::Initialize()) return -1; @@ -708,14 +712,14 @@ int wxEntry( int argc, char *argv[] ) if ( retValue == 0 ) { /* delete pending toplevel windows (typically a single - dialog) so that, if there isn't any left, we don't - call OnRun() */ + dialog) so that, if there isn't any left, we don't + call OnRun() */ wxTheApp->DeletePendingObjects(); - + wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; if (wxTheApp->Initialized()) - { + { retValue = wxTheApp->OnRun(); wxWindow *topWindow = wxTheApp->GetTopWindow(); @@ -733,7 +737,7 @@ int wxEntry( int argc, char *argv[] ) delete topWindow; wxTheApp->SetTopWindow( (wxWindow*) NULL ); } - } + } wxTheApp->OnExit(); } } @@ -757,3 +761,30 @@ int wxEntry( int argc, char *argv[] ) return retValue; } +#include "wx/gtk/info.xpm" +#include "wx/gtk/error.xpm" +#include "wx/gtk/question.xpm" +#include "wx/gtk/warning.xpm" + +wxIcon +wxApp::GetStdIcon(int which) const +{ + switch(which) + { + case wxICON_INFORMATION: + return wxIcon(info_xpm); + + case wxICON_QUESTION: + return wxIcon(question_xpm); + + case wxICON_EXCLAMATION: + return wxIcon(warning_xpm); + + default: + wxFAIL_MSG("requested non existent standard icon"); + // still fall through + + case wxICON_HAND: + return wxIcon(error_xpm); + } +}