issue NUMPAD constants only for Key but not for Char events, fixes #15073

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 560dfa24d0cdd7a330802e0fa68e36ba67f7d475..afd8247eb444bd6249a135a4f35e0fae94530d20 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -10,6 +10,10 @@
 #ifndef _WX_GTK_BITMAP_H_
 #define _WX_GTK_BITMAP_H_
 
 #ifndef _WX_GTK_BITMAP_H_
 #define _WX_GTK_BITMAP_H_
 

+#ifdef __WXGTK3__
+typedef struct _cairo cairo_t;
+typedef struct _cairo_surface cairo_surface_t;
+#endif

 typedef struct _GdkPixbuf GdkPixbuf;
 class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 
 typedef struct _GdkPixbuf GdkPixbuf;
 class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 


@@ -28,16 +32,29 @@ public:
 #endif // wxUSE_PALETTE
     wxMask( const wxBitmap& bitmap );
     virtual ~wxMask();
 #endif // wxUSE_PALETTE
     wxMask( const wxBitmap& bitmap );
     virtual ~wxMask();

+    wxBitmap GetBitmap() const;

 
     // implementation
 
     // implementation

-    GdkPixmap* m_bitmap;
-    GdkPixmap* GetBitmap() const;
+#ifdef __WXGTK3__
+    wxMask(cairo_surface_t*);
+    operator cairo_surface_t*() const;
+#else
+    wxMask(GdkPixmap*);
+    operator GdkPixmap*() const;
+#endif

 
 protected:
     virtual void FreeData();
     virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour);
     virtual bool InitFromMonoBitmap(const wxBitmap& bitmap);
 
 
 protected:
     virtual void FreeData();
     virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour);
     virtual bool InitFromMonoBitmap(const wxBitmap& bitmap);
 

+private:
+#ifdef __WXGTK3__
+    cairo_surface_t* m_bitmap;
+#else
+    GdkPixmap* m_bitmap;
+#endif
+

     DECLARE_DYNAMIC_CLASS(wxMask)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMask)
 };
 


@@ -62,9 +79,9 @@ public:
 #endif
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
 #if wxUSE_IMAGE
 #endif
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
 #if wxUSE_IMAGE

-    wxBitmap( const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH )
-        { (void)CreateFromImage(image, depth); }
+    wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH);

 #endif // wxUSE_IMAGE
 #endif // wxUSE_IMAGE

+    wxBitmap(GdkPixbuf* pixbuf, int depth = 0);

     virtual ~wxBitmap();
 
     bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
     virtual ~wxBitmap();
 
     bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);


@@ -84,6 +101,7 @@ public:
 
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
 
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );

+    wxBitmap GetMaskBitmap() const;

 
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
 
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 


@@ -94,7 +112,7 @@ public:
 #if wxUSE_PALETTE
     wxPalette *GetPalette() const;
     void SetPalette(const wxPalette& palette);
 #if wxUSE_PALETTE
     wxPalette *GetPalette() const;
     void SetPalette(const wxPalette& palette);

-    wxPalette *GetColourMap() const { return GetPalette(); };
+    wxPalette *GetColourMap() const { return GetPalette(); }

 #endif // wxUSE_PALETTE
 
     static void InitStandardHandlers();
 #endif // wxUSE_PALETTE
 
     static void InitStandardHandlers();


@@ -105,11 +123,18 @@ public:
     void SetHeight( int height );
     void SetWidth( int width );
     void SetDepth( int depth );
     void SetHeight( int height );
     void SetWidth( int width );
     void SetDepth( int depth );

-    void SetPixbuf(GdkPixbuf* pixbuf);

 
 

+#ifdef __WXGTK3__
+    GdkPixbuf* GetPixbufNoMask() const;
+    cairo_t* CairoCreate() const;
+    void Draw(cairo_t* cr, int x, int y, bool useMask = true, const wxColour* fg = NULL, const wxColour* bg = NULL) const;
+    void SetSourceSurface(cairo_t* cr, int x, int y, const wxColour* fg = NULL, const wxColour* bg = NULL) const;
+#else

     GdkPixmap *GetPixmap() const;
     bool HasPixmap() const;
     bool HasPixbuf() const;
     GdkPixmap *GetPixmap() const;
     bool HasPixmap() const;
     bool HasPixbuf() const;

+    wxBitmap(GdkPixmap* pixmap);
+#endif

     GdkPixbuf *GetPixbuf() const;
 
     // raw bitmap access support functions
     GdkPixbuf *GetPixbuf() const;
 
     // raw bitmap access support functions


@@ -119,14 +144,17 @@ public:
     bool HasAlpha() const;
 
 protected:
     bool HasAlpha() const;
 
 protected:

+#ifndef __WXGTK3__

 #if wxUSE_IMAGE
     bool CreateFromImage(const wxImage& image, int depth);
 #endif // wxUSE_IMAGE
 #if wxUSE_IMAGE
     bool CreateFromImage(const wxImage& image, int depth);
 #endif // wxUSE_IMAGE

+#endif

 
     virtual wxGDIRefData* CreateGDIRefData() const;
     virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
 
 private:
 
     virtual wxGDIRefData* CreateGDIRefData() const;
     virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
 
 private:

+#ifndef __WXGTK3__

     void SetPixmap(GdkPixmap* pixmap);
 #if wxUSE_IMAGE
     // to be called from CreateFromImage only!
     void SetPixmap(GdkPixmap* pixmap);
 #if wxUSE_IMAGE
     // to be called from CreateFromImage only!


@@ -144,6 +172,7 @@ public:
     // removes other representations from memory, keeping only 'keep'
     // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf):
     void PurgeOtherRepresentations(Representation keep);
     // removes other representations from memory, keeping only 'keep'
     // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf):
     void PurgeOtherRepresentations(Representation keep);

+#endif

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