minor fixes to wxLocale::GetSystemLanguage(), test code for it added to the console...

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

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 1d2f5417e504c6b8279007c583323deefe1fd556..a696eb125a06f05cb5fbb3ecb3d62909ff064a43 100644 (file)
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -28,6 +28,12 @@ class WXDLLEXPORT wxBitmapHandler;
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxCursor;
 
+GWorldPtr      wxMacCreateGWorld( int width , int height , int depth ) ;
+void           wxMacDestroyGWorld( GWorldPtr gw ) ;
+PicHandle      wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL ) ;
+void           wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue ) ;
+CTabHandle     wxMacCreateColorTable( int numColors ) ;
+
 // A mask is a mono bitmap used for drawing bitmaps
 // transparently.
 class WXDLLEXPORT wxMask: public wxObject
@@ -54,15 +60,15 @@ public:
   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; }
 protected:
   WXHBITMAP m_maskBitmap;
-*/
 };
 
+enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict } ;
+
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {
     friend class WXDLLEXPORT wxBitmap;
@@ -81,7 +87,9 @@ public:
   wxPalette     m_bitmapPalette;
   int           m_quality;
 
-/*  WXHBITMAP     m_hBitmap; TODO: platform-specific handle */
+       int                                             m_bitmapType ;
+       PicHandle                       m_hPict ;
+       WXHBITMAP     m_hBitmap;
   wxMask *      m_bitmapMask; // Optional mask
 };
 
@@ -92,6 +100,9 @@ class WXDLLEXPORT wxBitmapHandler: public wxObject
   DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 public:
   wxBitmapHandler() { m_name = ""; m_extension = ""; m_type = 0; };
+#ifdef __WXMAC_X__
+  virtual ~wxBitmapHandler() {}  // Added min for Mac X
+#endif
 
   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,
@@ -128,14 +139,12 @@ public:
   // Initialize with raw data.
   wxBitmap(const char bits[], int width, int height, int depth = 1);
 
-/* TODO: maybe implement XPM reading
   // Initialize with XPM data
   wxBitmap(const char **data);
-*/
+  wxBitmap(char **data);
 
   // 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_PICT_RESOURCE);
 
   // Constructor for generalised creation from data
   wxBitmap(void *data, long type, int width, int height, int depth = 1);
@@ -184,14 +193,12 @@ public:
 protected:
   static wxList sm_handlers;
 
-/*
   // TODO: Implementation
 public:
   void SetHBITMAP(WXHBITMAP bmp);
   inline WXHBITMAP GetHBITMAP() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hBitmap : 0); }
+  
   bool FreeResource(bool force = FALSE);
-*/
-
 };
 #endif
   // _WX_BITMAP_H_