fixed a missing backslash

[wxWidgets.git] / include / wx / gtk / bitmap.h

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 42f2dabc5a87130bd35371b277141b4f783a3ce4..94795def8e317e80cd18dc76e87c586d90721abd 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -29,6 +29,8 @@ class wxDC;
 class wxPaintDC;
 class wxMemoryDC;
 class wxToolBarGTK;
 class wxPaintDC;
 class wxMemoryDC;
 class wxToolBarGTK;

+class wxBitmapButton;
+class wxStaticBitmap;

 
 class wxMask;
 class wxBitmap;
 
 class wxMask;
 class wxBitmap;


@@ -45,7 +47,7 @@ class wxMask: public wxObject
   
     wxMask(void);
     wxMask( const wxBitmap& bitmap, const wxColour& colour );
   
     wxMask(void);
     wxMask( const wxBitmap& bitmap, const wxColour& colour );

-    wxMask( const wxBitmap& bitmap, const int paletteIndex );
+    wxMask( const wxBitmap& bitmap, int paletteIndex );

     wxMask( const wxBitmap& bitmap );
     ~wxMask(void);
 
     wxMask( const wxBitmap& bitmap );
     ~wxMask(void);
 


@@ -55,6 +57,8 @@ class wxMask: public wxObject
     friend wxDC;
     friend wxPaintDC;
     friend wxToolBarGTK;
     friend wxDC;
     friend wxPaintDC;
     friend wxToolBarGTK;

+    friend wxBitmapButton;
+    friend wxStaticBitmap;

     
     GdkBitmap *GetBitmap(void) const;
     
     
     GdkBitmap *GetBitmap(void) const;
     


@@ -76,12 +80,12 @@ class wxBitmap: public wxObject
   public:
 
     wxBitmap(void);
   public:
 
     wxBitmap(void);

-    wxBitmap( const int width, const int height, const int depth = -1 );
-    wxBitmap( const char bits[], const int width, const int height, const int depth = 1 );
+    wxBitmap( int width, int height, int depth = -1 );
+    wxBitmap( const char bits[], int width, int height, int depth = 1 );

     wxBitmap( char **bits );
     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxBitmap* bmp );
     wxBitmap( char **bits );
     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxBitmap* bmp );

-    wxBitmap( const wxString &filename, const int type );
+    wxBitmap( const wxString &filename, int type );

     ~wxBitmap(void);
     wxBitmap& operator = ( const wxBitmap& bmp );
     bool operator == ( const wxBitmap& bmp );
     ~wxBitmap(void);
     wxBitmap& operator = ( const wxBitmap& bmp );
     bool operator == ( const wxBitmap& bmp );


@@ -91,16 +95,18 @@ class wxBitmap: public wxObject
     int GetHeight(void) const;
     int GetWidth(void) const;
     int GetDepth(void) const;
     int GetHeight(void) const;
     int GetWidth(void) const;
     int GetDepth(void) const;

-    void SetHeight( const int height );
-    void SetWidth( const int width );
-    void SetDepth( const int depth );
+    void SetHeight( int height );
+    void SetWidth( int width );
+    void SetDepth( int depth );

 
     wxMask *GetMask(void) const;
     void SetMask( wxMask *mask );
     
 
     wxMask *GetMask(void) const;
     void SetMask( wxMask *mask );
     

-    bool SaveFile( const wxString &name, const int type, wxPalette *palette = NULL );
-    bool LoadFile( const wxString &name, const int type );
-        
+    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;
     wxPalette *GetColourMap(void) const
       { return GetPalette(); };
     wxPalette *GetPalette(void) const;
     wxPalette *GetColourMap(void) const
       { return GetPalette(); };


@@ -111,10 +117,16 @@ class wxBitmap: public wxObject
     friend wxPaintDC;
     friend wxMemoryDC;
     friend wxToolBarGTK;
     friend wxPaintDC;
     friend wxMemoryDC;
     friend wxToolBarGTK;

+    friend wxBitmapButton;
+    friend wxStaticBitmap;

 
     GdkPixmap *GetPixmap(void) const;
     GdkBitmap *GetBitmap(void) const;
     
 
     GdkPixmap *GetPixmap(void) const;
     GdkBitmap *GetBitmap(void) const;
     

+    void DestroyImage(void);
+    void RecreateImage(void);
+    void Render(void);
+    

     // no data :-)
 };
 
     // no data :-)
 };