AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added default value for "int type" (wxBITMAP_TYPE_XPM) in wxBitmap ctor

Browse Source 
and Load() method


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1998-07-24 14:35:48 +00:00
parent a7ca513e5a
commit 44216b3b2e
2 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,28 +44,28 @@ class wxMask: public wxObject
DECLARE_DYNAMIC_CLASS(wxMask) DECLARE_DYNAMIC_CLASS(wxMask)
public: public:
wxMask(void); wxMask();
wxMask( const wxBitmap& bitmap, const wxColour& colour ); wxMask( const wxBitmap& bitmap, const wxColour& colour );
wxMask( const wxBitmap& bitmap, int paletteIndex ); wxMask( const wxBitmap& bitmap, int paletteIndex );
wxMask( const wxBitmap& bitmap ); wxMask( const wxBitmap& bitmap );
~wxMask(void); ~wxMask();
private: private:
friend wxBitmap; friend wxBitmap;
friend wxDC; friend wxDC;
friend wxPaintDC; friend wxPaintDC;
friend wxToolBar; friend wxToolBar;
friend wxBitmapButton; friend wxBitmapButton;
friend wxStaticBitmap; friend wxStaticBitmap;
GdkBitmap *GetBitmap(void) const; GdkBitmap *GetBitmap() const;
protected: protected:
GdkBitmap *m_bitmap; GdkBitmap *m_bitmap;
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -79,40 +79,40 @@ class wxBitmap: public wxObject
public: public:
wxBitmap(void); wxBitmap();
wxBitmap( int width, int height, int depth = -1 ); wxBitmap( int width, int height, int depth = -1 );
wxBitmap( const char bits[], int width, int height, int depth = 1 ); wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( char **bits ); wxBitmap( char **bits );
wxBitmap( const wxBitmap& bmp ); wxBitmap( const wxBitmap& bmp );
wxBitmap( const wxBitmap* bmp ); wxBitmap( const wxBitmap* bmp );
wxBitmap( const wxString &filename, int type ); wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM);
~wxBitmap(void); ~wxBitmap();
wxBitmap& operator = ( const wxBitmap& bmp ); wxBitmap& operator = ( const wxBitmap& bmp );
bool operator == ( const wxBitmap& bmp ); bool operator == ( const wxBitmap& bmp );
bool operator != ( const wxBitmap& bmp ); bool operator != ( const wxBitmap& bmp );
bool Ok(void) const; bool Ok() const;
int GetHeight(void) const; int GetHeight() const;
int GetWidth(void) const; int GetWidth() const;
int GetDepth(void) const; int GetDepth() const;
void SetHeight( int height ); void SetHeight( int height );
void SetWidth( int width ); void SetWidth( int width );
void SetDepth( int depth ); void SetDepth( int depth );
wxMask *GetMask(void) const; wxMask *GetMask() const;
void SetMask( wxMask *mask ); void SetMask( wxMask *mask );
void Resize( int height, int width );
bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
bool LoadFile( const wxString &name, int type );
wxPalette *GetPalette(void) const; void Resize( int height, int width );
wxPalette *GetColourMap(void) const
bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM);
wxPalette *GetPalette() const;
wxPalette *GetColourMap() const
{ return GetPalette(); }; { return GetPalette(); };
private: private:
friend wxDC; friend wxDC;
friend wxPaintDC; friend wxPaintDC;
friend wxMemoryDC; friend wxMemoryDC;
@ -120,13 +120,13 @@ class wxBitmap: public wxObject
friend wxBitmapButton; friend wxBitmapButton;
friend wxStaticBitmap; friend wxStaticBitmap;
GdkPixmap *GetPixmap(void) const; GdkPixmap *GetPixmap() const;
GdkBitmap *GetBitmap(void) const; GdkBitmap *GetBitmap() const;
void DestroyImage(void); void DestroyImage();
void RecreateImage(void); void RecreateImage();
void Render(void); void Render();
// no data :-) // no data :-)
}; };

68
include/wx/gtk1/bitmap.h
View File

@ -44,28 +44,28 @@ class wxMask: public wxObject
DECLARE_DYNAMIC_CLASS(wxMask) DECLARE_DYNAMIC_CLASS(wxMask)
public: public:
wxMask(void); wxMask();
wxMask( const wxBitmap& bitmap, const wxColour& colour ); wxMask( const wxBitmap& bitmap, const wxColour& colour );
wxMask( const wxBitmap& bitmap, int paletteIndex ); wxMask( const wxBitmap& bitmap, int paletteIndex );
wxMask( const wxBitmap& bitmap ); wxMask( const wxBitmap& bitmap );
~wxMask(void); ~wxMask();
private: private:
friend wxBitmap; friend wxBitmap;
friend wxDC; friend wxDC;
friend wxPaintDC; friend wxPaintDC;
friend wxToolBar; friend wxToolBar;
friend wxBitmapButton; friend wxBitmapButton;
friend wxStaticBitmap; friend wxStaticBitmap;
GdkBitmap *GetBitmap(void) const; GdkBitmap *GetBitmap() const;
protected: protected:
GdkBitmap *m_bitmap; GdkBitmap *m_bitmap;
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -79,40 +79,40 @@ class wxBitmap: public wxObject
public: public:
wxBitmap(void); wxBitmap();
wxBitmap( int width, int height, int depth = -1 ); wxBitmap( int width, int height, int depth = -1 );
wxBitmap( const char bits[], int width, int height, int depth = 1 ); wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( char **bits ); wxBitmap( char **bits );
wxBitmap( const wxBitmap& bmp ); wxBitmap( const wxBitmap& bmp );
wxBitmap( const wxBitmap* bmp ); wxBitmap( const wxBitmap* bmp );
wxBitmap( const wxString &filename, int type ); wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM);
~wxBitmap(void); ~wxBitmap();
wxBitmap& operator = ( const wxBitmap& bmp ); wxBitmap& operator = ( const wxBitmap& bmp );
bool operator == ( const wxBitmap& bmp ); bool operator == ( const wxBitmap& bmp );
bool operator != ( const wxBitmap& bmp ); bool operator != ( const wxBitmap& bmp );
bool Ok(void) const; bool Ok() const;
int GetHeight(void) const; int GetHeight() const;
int GetWidth(void) const; int GetWidth() const;
int GetDepth(void) const; int GetDepth() const;
void SetHeight( int height ); void SetHeight( int height );
void SetWidth( int width ); void SetWidth( int width );
void SetDepth( int depth ); void SetDepth( int depth );
wxMask *GetMask(void) const; wxMask *GetMask() const;
void SetMask( wxMask *mask ); void SetMask( wxMask *mask );
void Resize( int height, int width );
bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
bool LoadFile( const wxString &name, int type );
wxPalette *GetPalette(void) const; void Resize( int height, int width );
wxPalette *GetColourMap(void) const
bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM);
wxPalette *GetPalette() const;
wxPalette *GetColourMap() const
{ return GetPalette(); }; { return GetPalette(); };
private: private:
friend wxDC; friend wxDC;
friend wxPaintDC; friend wxPaintDC;
friend wxMemoryDC; friend wxMemoryDC;
@ -120,13 +120,13 @@ class wxBitmap: public wxObject
friend wxBitmapButton; friend wxBitmapButton;
friend wxStaticBitmap; friend wxStaticBitmap;
GdkPixmap *GetPixmap(void) const; GdkPixmap *GetPixmap() const;
GdkBitmap *GetBitmap(void) const; GdkBitmap *GetBitmap() const;
void DestroyImage(void); void DestroyImage();
void RecreateImage(void); void RecreateImage();
void Render(void); void Render();
// no data :-) // no data :-)
}; };