X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88a7a4e10ed18f81a576dcd866cfbf02bf404c00..f5bed7a885024108682c32c74567cdf7bf2ed13b:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index aeeb7ee8c0..c9f6bbc827 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -20,20 +20,20 @@ #ifndef WX_PRECOMP #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/dialog.h" + #include "wx/settings.h" + #include "wx/msgdlg.h" + #include "wx/memory.h" + #include "wx/font.h" + #include "wx/gdicmn.h" + #include "wx/image.h" #endif -#include "wx/gdicmn.h" -#include "wx/utils.h" -#include "wx/log.h" -#include "wx/memory.h" -#include "wx/font.h" -#include "wx/settings.h" -#include "wx/dialog.h" -#include "wx/msgdlg.h" #include "wx/file.h" #include "wx/filename.h" #include "wx/module.h" -#include "wx/image.h" #include "wx/thread.h" #ifdef __WXGPE__ @@ -45,10 +45,6 @@ #include "wx/univ/renderer.h" #endif -#if wxUSE_THREADS - #include "wx/thread.h" -#endif - #include #ifdef HAVE_POLL @@ -80,7 +76,7 @@ #include "wx/gtk/win_gtk.h" #include "wx/gtk/private.h" -#include +#include //----------------------------------------------------------------------------- // link GnomeVFS @@ -95,7 +91,7 @@ FORCE_LINK(gnome_vfs) // global data //----------------------------------------------------------------------------- -bool g_mainThreadLocked = FALSE; +bool g_mainThreadLocked = false; gint g_pendingTag = 0; static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; @@ -257,7 +253,7 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) #if wxUSE_THREADS wxMutexLocker lock(gs_idleTagsMutex); #endif - g_isIdle = TRUE; + g_isIdle = true; wxTheApp->m_idleTag = 0; } @@ -348,14 +344,14 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) gdk_threads_enter(); wxMutexGuiLeave(); - g_mainThreadLocked = TRUE; + g_mainThreadLocked = true; // we rely on the fact that glib GPollFD struct is really just pollfd but // I wonder how wise is this in the long term (VZ) gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout ); wxMutexGuiEnter(); - g_mainThreadLocked = FALSE; + g_mainThreadLocked = false; gdk_threads_leave(); @@ -384,7 +380,7 @@ void wxapp_install_idle_handler() wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); - g_isIdle = FALSE; + g_isIdle = false; if (g_pendingTag == 0) g_pendingTag = g_idle_add_full( 900, wxapp_pending_callback, NULL, NULL ); @@ -424,19 +420,17 @@ END_EVENT_TABLE() wxApp::wxApp() { #ifdef __WXDEBUG__ - m_isInAssert = FALSE; + m_isInAssert = false; #endif // __WXDEBUG__ m_idleTag = 0; - g_isIdle = TRUE; + g_isIdle = true; wxapp_install_idle_handler(); #if wxUSE_THREADS g_main_context_set_poll_func( NULL, wxapp_poll_func ); #endif - m_colorCube = (unsigned char*) NULL; - // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp m_glVisualInfo = (void *) NULL; m_glFBCInfo = (void *) NULL; @@ -446,17 +440,12 @@ wxApp::~wxApp() { if (m_idleTag) g_source_remove( m_idleTag ); - - if (m_colorCube) - free(m_colorCube); } bool wxApp::OnInitGui() { if ( !wxAppBase::OnInitGui() ) - return FALSE; - - GdkVisual *visual = gdk_visual_get_system(); + return false; // if this is a wxGLApp (derived from wxApp), and we've already // chosen a specific visual, then derive the GdkVisual from that @@ -467,8 +456,6 @@ bool wxApp::OnInitGui() GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); gtk_widget_set_default_colormap( colormap ); - - visual = vis; } // On some machines, the default visual is just 256 colours, so @@ -482,59 +469,6 @@ bool wxApp::OnInitGui() 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; - - // 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); - - int index = -1; - - GdkColor *colors = cmap->colors; - if (colors) - { - int max = 3 * 65536; - - for (int i = 0; i < cmap->size; i++) - { - int rdiff = ((rr << 8) - colors[i].red); - int gdiff = ((gg << 8) - colors[i].green); - 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; - } - m_colorCube[ (r*1024) + (g*32) + b ] = index; - } - } } return true; @@ -664,7 +598,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) return false; } - wxSetDetectableAutoRepeat( TRUE ); + wxSetDetectableAutoRepeat( true ); #if wxUSE_INTL wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); @@ -688,7 +622,7 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxC wxAppBase::OnAssert(file, line, cond, msg); - m_isInAssert = FALSE; + m_isInAssert = false; } #endif // __WXDEBUG__ @@ -702,6 +636,6 @@ void wxApp::RemoveIdleTag() { g_source_remove( wxTheApp->m_idleTag ); wxTheApp->m_idleTag = 0; - g_isIdle = TRUE; + g_isIdle = true; } }