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

Remove GTK2 stuff from src/gtk1. Rename wx/gtk includes to wx/gtk1.

Browse Source 
57 files changed, 394 insertions(+), 6767 deletions(-)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2006-01-23 01:14:32 +00:00
parent 9fa72bd2a6
commit 3cbab64109
57 changed files with 403 additions and 6777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gtk1/bmpbuttn.cpp
View File

@@ -16,7 +16,7 @@
#include "wx/bmpbuttn.h"
#include "wx/gtk/private.h"
#include "wx/gtk1/private.h"
//-----------------------------------------------------------------------------
// classes
@@ -224,29 +224,14 @@ void wxBitmapButton::OnSetBitmap()
{
// initial bitmap
GtkWidget *pixmap;
#ifdef __WXGTK20__
if (the_one.HasPixbuf())
pixmap = gtk_image_new_from_pixbuf(the_one.GetPixbuf());
else
pixmap = gtk_image_new_from_pixmap(the_one.GetPixmap(), mask);
#else
pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
#endif
gtk_widget_show(pixmap);
gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
}
else
{ // subsequent bitmaps
#ifdef __WXGTK20__
GtkImage *pixmap = GTK_IMAGE(child);
if (the_one.HasPixbuf())
gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf());
else
gtk_image_set_from_pixmap(pixmap, the_one.GetPixmap(), mask);
#else
GtkPixmap *pixmap = GTK_PIXMAP(child);
gtk_pixmap_set(pixmap, the_one.GetPixmap(), mask);
#endif
}
}