Nuke GTK1 from include/gtk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2006-01-22 21:00:19 +00:00
parent 6330f4bb19
commit bdbd4e9612
10 changed files with 15 additions and 109 deletions

View File

@@ -17,9 +17,7 @@
#include "wx/palette.h"
#include "wx/gdiobj.h"
#ifdef __WXGTK20__
typedef struct _GdkPixbuf GdkPixbuf;
#endif
class WXDLLEXPORT wxPixelDataBase;
@@ -118,17 +116,13 @@ public:
void SetDepth( int depth );
void SetPixmap( GdkPixmap *pixmap );
void SetBitmap( GdkBitmap *bitmap );
#ifdef __WXGTK20__
void SetPixbuf(GdkPixbuf *pixbuf);
#endif
GdkPixmap *GetPixmap() const;
GdkBitmap *GetBitmap() const;
bool HasPixmap() const;
#ifdef __WXGTK20__
bool HasPixbuf() const;
GdkPixbuf *GetPixbuf() const;
#endif
// Basically, this corresponds to Win32 StretchBlt()
wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height );
@@ -149,7 +143,6 @@ private:
bool CreateFromImageAsBitmap(const wxImage& image);
bool CreateFromImageAsPixmap(const wxImage& image);
#ifdef __WXGTK20__
bool CreateFromImageAsPixbuf(const wxImage& image);
enum Representation
@@ -162,7 +155,6 @@ private:
void PurgeOtherRepresentations(Representation keep);
friend class wxMemoryDC;
#endif
friend class wxBitmapHandler;
private: