Define wxUSE_UNICODE_MSLU or chkconf.h complains

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 6ad8ede7d6e56528fb57d28bbada6c42594bdbe5..c3058826d59f75050d356ee284072b05d634fc49 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -25,6 +25,8 @@
 typedef struct _GdkPixbuf GdkPixbuf;
 #endif
 
 typedef struct _GdkPixbuf GdkPixbuf;
 #endif
 

+class WXDLLEXPORT wxPixelDataBase;
+

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------


@@ -106,7 +108,7 @@ public:
     wxPalette *GetColourMap() const { return GetPalette(); };
 #endif // wxUSE_PALETTE
 
     wxPalette *GetColourMap() const { return GetPalette(); };
 #endif // wxUSE_PALETTE
 

-    static void InitStandardHandlers() { }
+    static void InitStandardHandlers();

 
     // implementation
     // --------------
 
     // implementation
     // --------------


@@ -130,6 +132,14 @@ public:
     
     // Basically, this corresponds to Win32 StretchBlt()
     wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height );
     
     // Basically, this corresponds to Win32 StretchBlt()
     wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height );

+    
+    // raw bitmap access support functions
+    void *GetRawData(wxPixelDataBase& data, int bpp);
+    void UngetRawData(wxPixelDataBase& data);
+
+    bool HasAlpha() const;
+    void UseAlpha();
+

 protected:
     bool CreateFromXpm(const char **bits);
     bool CreateFromImage(const wxImage& image, int depth);
 protected:
     bool CreateFromXpm(const char **bits);
     bool CreateFromImage(const wxImage& image, int depth);


@@ -153,8 +163,30 @@ private:
 
     friend class wxMemoryDC;
 #endif
 
     friend class wxMemoryDC;
 #endif

-    
+    friend class wxBitmapHandler;
+
+private:    

     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 

+//-----------------------------------------------------------------------------
+// wxBitmapHandler
+//-----------------------------------------------------------------------------
+
+class wxBitmapHandler: public wxBitmapHandlerBase
+{
+public:
+    wxBitmapHandler() { }
+    virtual ~wxBitmapHandler();
+
+    virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
+    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
+        int desiredWidth, int desiredHeight);
+    virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
+};
+
+

 #endif // __GTKBITMAPH__
 #endif // __GTKBITMAPH__