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

Removed usage of GdkImlib

Browse Source 
Added platform independent wxImage class
  Changed wxBitmap and wxImageList accordingly
  Correctted header text


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-10-24 17:12:05 +00:00
parent 0ab4b99cdf
commit 01111366c9
81 changed files with 1935 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/gtk/bitmap.h
View File

@@ -2,9 +2,8 @@
// Name: bitmap.h
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -20,6 +19,7 @@
#include "wx/object.h"
#include "wx/string.h"
#include "wx/palette.h"
#include "wx/image.h"
//-----------------------------------------------------------------------------
// classes
@@ -60,7 +60,6 @@ class wxMask: public wxObject
// wxBitmap
//-----------------------------------------------------------------------------
// CMB 20/5/98: added xbm constructor and GetBitmap() method
class wxBitmap: public wxObject
{
DECLARE_DYNAMIC_CLASS(wxBitmap)
@@ -70,6 +69,7 @@ class wxBitmap: public wxObject
wxBitmap();
wxBitmap( int width, int height, int depth = -1 );
wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( const wxImage &image );
wxBitmap( char **bits );
wxBitmap( const wxBitmap& bmp );
wxBitmap( const wxBitmap* bmp );
@@ -79,6 +79,8 @@ class wxBitmap: public wxObject
bool operator == ( const wxBitmap& bmp );
bool operator != ( const wxBitmap& bmp );
bool Ok() const;
wxImage ConvertToImage() const;
int GetHeight() const;
int GetWidth() const;
@@ -90,8 +92,6 @@ class wxBitmap: public wxObject
wxMask *GetMask() const;
void SetMask( wxMask *mask );
void Resize( int height, int width );
bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM);
@@ -104,10 +104,6 @@ class wxBitmap: public wxObject
GdkPixmap *GetPixmap() const;
GdkBitmap *GetBitmap() const;
void DestroyImage();
void RecreateImage();
void Render();
// no data :-)
};