gtk1 fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index df18f4be1b382187d5c3d9384df6d08727d6e55f..cf82cba2cc1761ff09ddad522eb18584b6268ebb 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -171,7 +171,7 @@ wxSaveFileSelector(const wxChar *what,
 #elif defined(__WXGTK20__)
 #include "wx/gtk/filedlg.h"
 #elif defined(__WXGTK__)
-#include "wx/generic/filedlgg.h"
+#include "wx/gtk1/filedlg.h"
 #elif defined(__WXX11__)
 #include "wx/generic/filedlgg.h"
 #elif defined(__WXMGL__)

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index 9da84b3052518c6634c2701d498c8783c3e40ba1..c84141bd0a3aa766ac48b5362759d1300de8a74c 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -112,8 +112,9 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
 
     FreeColour();
 
-    if ( (cmap->visual->type == GDK_VISUAL_GRAYSCALE) ||
-         (cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR) )
+    GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
+    if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
+        (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
     {
         m_hasPixel = gdk_colormap_alloc_color( cmap, &m_color, FALSE, TRUE );
         int idx = m_color.pixel;

diff --git a/src/gtk1/statbmp.cpp b/src/gtk1/statbmp.cpp
index 59c3c7e555c2a6c14bf6d2e8c06bf26b7f264420..03a0f9682a46ef1a3cf210d14babbc9500b87c78 100644 (file)
--- a/src/gtk1/statbmp.cpp
+++ b/src/gtk1/statbmp.cpp
@@ -78,14 +78,7 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
         if (m_bitmap.GetMask())
             mask = m_bitmap.GetMask()->GetBitmap();
 
-        if (m_bitmap.HasPixbuf())
-        {
-            gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget),
-                                      m_bitmap.GetPixbuf());
-        }
-        else
-            gtk_image_set_from_pixmap(GTK_IMAGE(m_widget),
-                                      m_bitmap.GetPixmap(), mask);
+        gtk_pixmap_set(GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask);
 
         InvalidateBestSize();
         SetSize(GetBestSize());