wxFrameBase class for wxMSW and wxGTK

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

diff --git a/include/wx/motif/bitmap.h b/include/wx/motif/bitmap.h
index 104ec5beb3542d211ad34b6830a5080e3850dc84..6cc1da17659191f32805741bdbf1770da8fff33e 100644 (file)
--- a/include/wx/motif/bitmap.h
+++ b/include/wx/motif/bitmap.h
@@ -54,13 +54,11 @@ public:
   bool Create(const wxBitmap& bitmap, int paletteIndex);
   bool Create(const wxBitmap& bitmap);
 
   bool Create(const wxBitmap& bitmap, int paletteIndex);
   bool Create(const wxBitmap& bitmap);
 

-/* TODO: platform-specific data access
-  // Implementation
-  inline WXHBITMAP GetMaskBitmap() const { return m_maskBitmap; }
-  inline void SetMaskBitmap(WXHBITMAP bmp) { m_maskBitmap = bmp; }
+  WXPixmap GetPixmap() const { return m_pixmap; }
+  void SetPixmap(WXPixmap pixmap) { m_pixmap = pixmap; }
+

 protected:
 protected:

-  WXHBITMAP m_maskBitmap;
-*/
+  WXPixmap      m_pixmap;

 };
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 };
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData


@@ -73,16 +71,30 @@ public:
     ~wxBitmapRefData();
 
 public:
     ~wxBitmapRefData();
 
 public:

-  int           m_width;
-  int           m_height;
-  int           m_depth;
-  bool          m_ok;
-  int           m_numColors;
-  wxPalette     m_bitmapPalette;
-  int           m_quality;
-
-/*  WXHBITMAP     m_hBitmap; TODO: platform-specific handle */
-  wxMask *      m_bitmapMask; // Optional mask
+  int               m_width;
+  int               m_height;
+  int               m_depth;
+  bool              m_ok;
+  int               m_numColors;
+  wxPalette         m_bitmapPalette;
+  int               m_quality;
+
+  wxMask *          m_bitmapMask; // Optional mask
+
+  // Motif implementation
+public:
+  WXPixmap          m_pixmap;
+  WXDisplay*        m_display;
+  bool              m_freePixmap;
+  unsigned long*    m_freeColors;
+  long              m_freeColorsCount;
+
+  // These 5 variables are for wxControl
+  WXPixmap          m_insensPixmap ;
+  WXPixmap          m_labelPixmap ;
+  WXPixmap          m_armPixmap ;
+  WXImage*          m_image ;
+  WXImage*          m_insensImage ;

 };
 
 #define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
 };
 
 #define M_BITMAPDATA ((wxBitmapRefData *)m_refData)


@@ -98,12 +110,12 @@ public:
       int desiredWidth, int desiredHeight);
   virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
 
       int desiredWidth, int desiredHeight);
   virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
 

-  inline void SetName(const wxString& name) { m_name = name; }
-  inline void SetExtension(const wxString& ext) { m_extension = ext; }
-  inline void SetType(long type) { m_type = type; }
-  inline wxString GetName() const { return m_name; }
-  inline wxString GetExtension() const { return m_extension; }
-  inline long GetType() const { return m_type; }
+  void SetName(const wxString& name) { m_name = name; }
+  void SetExtension(const wxString& ext) { m_extension = ext; }
+  void SetType(long type) { m_type = type; }
+  wxString GetName() const { return m_name; }
+  wxString GetExtension() const { return m_extension; }
+  long GetType() const { return m_type; }

 protected:
   wxString  m_name;
   wxString  m_extension;
 protected:
   wxString  m_name;
   wxString  m_extension;


@@ -122,21 +134,17 @@ public:
   wxBitmap(); // Platform-specific
 
   // Copy constructors
   wxBitmap(); // Platform-specific
 
   // Copy constructors

-  inline wxBitmap(const wxBitmap& bitmap)
+  wxBitmap(const wxBitmap& bitmap)

   { Ref(bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }
   { Ref(bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }

-  inline wxBitmap(const wxBitmap* bitmap) { if (bitmap) Ref(*bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }

 
 

-  // Initialize with raw data.
+  // Initialize with raw XBM data

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

-/* TODO: maybe implement XPM reading

   // Initialize with XPM data
   // Initialize with XPM data

-  wxBitmap(const char **data);
-*/
+  wxBitmap(char **data, wxControl* control = NULL);

 
   // Load a file or resource
 
   // Load a file or resource

-  // TODO: make default type whatever's appropriate for the platform.
-  wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
+  wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_XPM);

 
   // Constructor for generalised creation from data
   wxBitmap(void *data, long type, int width, int height, int depth = 1);
 
   // Constructor for generalised creation from data
   wxBitmap(void *data, long type, int width, int height, int depth = 1);


@@ -147,32 +155,32 @@ public:
 
   virtual bool Create(int width, int height, int depth = -1);
   virtual bool Create(void *data, long type, int width, int height, int depth = 1);
 
   virtual bool Create(int width, int height, int depth = -1);
   virtual bool Create(void *data, long type, int width, int height, int depth = 1);

-  virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
+  virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XPM);

   virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
 
   virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
 

-  inline bool Ok() const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }
-  inline int GetWidth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); }
-  inline int GetHeight() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_height : 0); }
-  inline int GetDepth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_depth : 0); }
-  inline int GetQuality() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_quality : 0); }
+  bool Ok() const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }
+  int GetWidth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); }
+  int GetHeight() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_height : 0); }
+  int GetDepth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_depth : 0); }
+  int GetQuality() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_quality : 0); }

   void SetWidth(int w);
   void SetHeight(int h);
   void SetDepth(int d);
   void SetQuality(int q);
   void SetOk(bool isOk);
 
   void SetWidth(int w);
   void SetHeight(int h);
   void SetDepth(int d);
   void SetQuality(int q);
   void SetOk(bool isOk);
 

-  inline wxPalette* GetPalette() const { return (M_BITMAPDATA ? (& M_BITMAPDATA->m_bitmapPalette) : (wxPalette*) NULL); }
+  wxPalette* GetPalette() const { return (M_BITMAPDATA ? (& M_BITMAPDATA->m_bitmapPalette) : (wxPalette*) NULL); }

   void SetPalette(const wxPalette& palette);
 
   void SetPalette(const wxPalette& palette);
 

-  inline wxMask *GetMask() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_bitmapMask : (wxMask*) NULL); }
+  wxMask *GetMask() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_bitmapMask : (wxMask*) NULL); }

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

-  inline wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }
-  inline bool operator == (const wxBitmap& bitmap) { return m_refData == bitmap.m_refData; }
-  inline bool operator != (const wxBitmap& bitmap) { return m_refData != bitmap.m_refData; }
+  wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }
+  bool operator == (const wxBitmap& bitmap) { return m_refData == bitmap.m_refData; }
+  bool operator != (const wxBitmap& bitmap) { return m_refData != bitmap.m_refData; }

 
   // Format handling
 
   // Format handling

-  static inline wxList& GetHandlers() { return sm_handlers; }
+  static wxList& GetHandlers() { return sm_handlers; }

   static void AddHandler(wxBitmapHandler *handler);
   static void InsertHandler(wxBitmapHandler *handler);
   static bool RemoveHandler(const wxString& name);
   static void AddHandler(wxBitmapHandler *handler);
   static void InsertHandler(wxBitmapHandler *handler);
   static bool RemoveHandler(const wxString& name);


@@ -182,17 +190,22 @@ public:
 
   static void InitStandardHandlers();
   static void CleanUpHandlers();
 
   static void InitStandardHandlers();
   static void CleanUpHandlers();

-protected:
-  static wxList sm_handlers;

 
 

-/*
-  // TODO: Implementation
+  // Motif implementation

 public:
 public:

-  void SetHBITMAP(WXHBITMAP bmp);
-  inline WXHBITMAP GetHBITMAP() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hBitmap : 0); }
-  bool FreeResource(bool force = FALSE);
-*/
+  WXDisplay* GetDisplay() const { return M_BITMAPDATA->m_display; }
+  WXDisplay* GetPixmap() const { return M_BITMAPDATA->m_pixmap; }
+  virtual WXPixmap GetLabelPixmap(WXWidget w) ;
+  virtual WXPixmap GetArmPixmap(WXWidget w) ;
+  virtual WXPixmap GetInsensPixmap(WXWidget w = (WXWidget) 0) ;

 
 

+protected:
+  static wxList sm_handlers;

 };
 };

+
+// Creates a bitmap with transparent areas drawn in
+// the given colour.
+wxBitmap wxCreateMaskedBitmap(wxBitmap& bitmap, wxColour& colour);
+

 #endif
   // _WX_BITMAP_H_
 #endif
   // _WX_BITMAP_H_