[ 1508778 ] Fix for wxOwnerDrawnComboBox list selection rendering.

[wxWidgets.git] / src / gtk / app.cpp

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 286164ca96f27436a2f4fed2685452f2826aa7c6..3169d499144ff4223d763828c843c592299407e3 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.cpp
+// Name:        src/gtk/app.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -17,15 +17,19 @@
 #include "wx/wxprec.h"
 
 #include "wx/app.h"
 #include "wx/wxprec.h"
 
 #include "wx/app.h"

-#include "wx/gdicmn.h"
-#include "wx/utils.h"
-#include "wx/intl.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"
+
+#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"
+#endif
+

 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/module.h"
 #include "wx/file.h"
 #include "wx/filename.h"
 #include "wx/module.h"


@@ -33,7 +37,7 @@
 #include "wx/thread.h"
 
 #ifdef __WXGPE__
 #include "wx/thread.h"
 
 #ifdef __WXGPE__

-#include <gpe/init.h>
+    #include <gpe/init.h>

 #endif
 
 #ifdef __WXUNIVERSAL__
 #endif
 
 #ifdef __WXUNIVERSAL__


@@ -41,10 +45,6 @@
     #include "wx/univ/renderer.h"
 #endif
 
     #include "wx/univ/renderer.h"
 #endif
 

-#if wxUSE_THREADS
-    #include "wx/thread.h"
-#endif
-

 #include <unistd.h>
 
 #ifdef HAVE_POLL
 #include <unistd.h>
 
 #ifdef HAVE_POLL


@@ -76,7 +76,7 @@
 #include "wx/gtk/win_gtk.h"
 #include "wx/gtk/private.h"
 
 #include "wx/gtk/win_gtk.h"
 #include "wx/gtk/private.h"
 

-#include <gtk/gtk.h>
+#include <gdk/gdkx.h>

 
 //-----------------------------------------------------------------------------
 // link GnomeVFS
 
 //-----------------------------------------------------------------------------
 // link GnomeVFS


@@ -91,7 +91,7 @@ FORCE_LINK(gnome_vfs)
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-bool   g_mainThreadLocked = FALSE;
+bool   g_mainThreadLocked = false;

 gint   g_pendingTag = 0;
 
 static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
 gint   g_pendingTag = 0;
 
 static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;


@@ -113,7 +113,7 @@ static wxMutex gs_idleTagsMutex;
 // not static because used by textctrl.cpp
 //
 // MT-FIXME
 // not static because used by textctrl.cpp
 //
 // MT-FIXME

-bool wxIsInsideYield = FALSE;
+bool wxIsInsideYield = false;

 
 bool wxApp::Yield(bool onlyIfNeeded)
 {
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {


@@ -124,18 +124,18 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 

-        return FALSE;
+        return false;

     }
 
 #if wxUSE_THREADS
     if ( !wxThread::IsMain() )
     {
         // can't call gtk_main_iteration() from other threads like this
     }
 
 #if wxUSE_THREADS
     if ( !wxThread::IsMain() )
     {
         // can't call gtk_main_iteration() from other threads like this

-        return TRUE;
+        return true;

     }
 #endif // wxUSE_THREADS
 
     }
 #endif // wxUSE_THREADS
 

-    wxIsInsideYield = TRUE;
+    wxIsInsideYield = true;

 
     // We need to remove idle callbacks or the loop will
     // never finish.
 
     // We need to remove idle callbacks or the loop will
     // never finish.


@@ -163,9 +163,9 @@ bool wxApp::Yield(bool onlyIfNeeded)
     wxLog::Resume();
 #endif
 
     wxLog::Resume();
 #endif
 

-    wxIsInsideYield = FALSE;
+    wxIsInsideYield = false;

 
 

-    return TRUE;
+    return true;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -253,7 +253,7 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 #if wxUSE_THREADS
         wxMutexLocker lock(gs_idleTagsMutex);
 #endif
 #if wxUSE_THREADS
         wxMutexLocker lock(gs_idleTagsMutex);
 #endif

-        g_isIdle = TRUE;
+        g_isIdle = true;

         wxTheApp->m_idleTag = 0;
     }
 
         wxTheApp->m_idleTag = 0;
     }
 


@@ -344,14 +344,14 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
     gdk_threads_enter();
 
     wxMutexGuiLeave();
     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();
 
     // 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();
 
 
     gdk_threads_leave();
 


@@ -380,7 +380,7 @@ void wxapp_install_idle_handler()
 
     wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
 
 
     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 );
 
     if (g_pendingTag == 0)
         g_pendingTag = g_idle_add_full( 900, wxapp_pending_callback, NULL, NULL );


@@ -420,19 +420,17 @@ END_EVENT_TABLE()
 wxApp::wxApp()
 {
 #ifdef __WXDEBUG__
 wxApp::wxApp()
 {
 #ifdef __WXDEBUG__

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 #endif // __WXDEBUG__
 
     m_idleTag = 0;
 #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
 
     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;
     // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
     m_glVisualInfo = (void *) NULL;
     m_glFBCInfo = (void *) NULL;


@@ -442,17 +440,12 @@ wxApp::~wxApp()
 {
     if (m_idleTag)
         g_source_remove( m_idleTag );
 {
     if (m_idleTag)
         g_source_remove( m_idleTag );

-
-    if (m_colorCube)
-        free(m_colorCube);

 }
 
 bool wxApp::OnInitGui()
 {
     if ( !wxAppBase::OnInitGui() )
 }
 
 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
 
     // if this is a wxGLApp (derived from wxApp), and we've already
     // chosen a specific visual, then derive the GdkVisual from that


@@ -463,8 +456,6 @@ bool wxApp::OnInitGui()
 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );
 
         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
     }
 
     // On some machines, the default visual is just 256 colours, so


@@ -478,62 +469,9 @@ bool wxApp::OnInitGui()
 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );
 
         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;
+    return true;

 }
 
 GdkVisual *wxApp::GetGdkVisual()
 }
 
 GdkVisual *wxApp::GetGdkVisual()


@@ -543,7 +481,7 @@ GdkVisual *wxApp::GetGdkVisual()
     if (m_glVisualInfo)
         visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
     else
     if (m_glVisualInfo)
         visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
     else

-        visual = gdk_window_get_visual( wxGetRootWindow()->window );
+        visual = gdk_drawable_get_visual( wxGetRootWindow()->window );

 
     wxASSERT( visual );
 
 
     wxASSERT( visual );
 


@@ -555,18 +493,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     bool init_result;
 
 #if wxUSE_THREADS
     bool init_result;
 
 #if wxUSE_THREADS

-    // GTK 1.2 up to version 1.2.3 has broken threads
-    if ((gtk_major_version == 1) &&
-        (gtk_minor_version == 2) &&
-        (gtk_micro_version < 4))
-    {
-        printf( "wxWidgets warning: GUI threading disabled due to outdated GTK version\n" );
-    }
-    else
-    {
-        if (!g_thread_supported())
-            g_thread_init(NULL);
-    }
+    if (!g_thread_supported())
+        g_thread_init(NULL);

 #endif // wxUSE_THREADS
 
     gtk_set_locale();
 #endif // wxUSE_THREADS
 
     gtk_set_locale();


@@ -670,7 +598,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         return false;
     }
 
         return false;
     }
 

-    wxSetDetectableAutoRepeat( TRUE );
+    wxSetDetectableAutoRepeat( true );

 
 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 
 #if wxUSE_INTL
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());


@@ -690,11 +618,11 @@ void wxApp::CleanUp()
 
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {
 
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
 {

-    m_isInAssert = TRUE;
+    m_isInAssert = true;

 
     wxAppBase::OnAssert(file, line, cond, msg);
 
 
     wxAppBase::OnAssert(file, line, cond, msg);
 

-    m_isInAssert = FALSE;
+    m_isInAssert = false;

 }
 
 #endif // __WXDEBUG__
 }
 
 #endif // __WXDEBUG__


@@ -708,6 +636,6 @@ void wxApp::RemoveIdleTag()
     {
         g_source_remove( wxTheApp->m_idleTag );
         wxTheApp->m_idleTag = 0;
     {
         g_source_remove( wxTheApp->m_idleTag );
         wxTheApp->m_idleTag = 0;

-        g_isIdle = TRUE;
+        g_isIdle = true;

     }
 }
     }
 }