Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk1 fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-01-23 14:29:29 +00:00
parent d044deea91
commit 7e52dfd26d
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/filedlg.h
View File

@@ -171,7 +171,7 @@ wxSaveFileSelector(const wxChar *what,
#elif defined(__WXGTK20__) #elif defined(__WXGTK20__)
#include "wx/gtk/filedlg.h" #include "wx/gtk/filedlg.h"
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
#include "wx/generic/filedlgg.h" #include "wx/gtk1/filedlg.h"
#elif defined(__WXX11__) #elif defined(__WXX11__)
#include "wx/generic/filedlgg.h" #include "wx/generic/filedlgg.h"
#elif defined(__WXMGL__) #elif defined(__WXMGL__)

5
src/gtk1/colour.cpp
View File

@@ -112,8 +112,9 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
FreeColour(); FreeColour();
if ( (cmap->visual->type == GDK_VISUAL_GRAYSCALE) || GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
(cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR) ) 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 ); m_hasPixel = gdk_colormap_alloc_color( cmap, &m_color, FALSE, TRUE );
int idx = m_color.pixel; int idx = m_color.pixel;

9
src/gtk1/statbmp.cpp
View File

@@ -78,14 +78,7 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
if (m_bitmap.GetMask()) if (m_bitmap.GetMask())
mask = m_bitmap.GetMask()->GetBitmap(); mask = m_bitmap.GetMask()->GetBitmap();
if (m_bitmap.HasPixbuf()) gtk_pixmap_set(GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask);
{
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);
InvalidateBestSize(); InvalidateBestSize();
SetSize(GetBestSize()); SetSize(GetBestSize());