Removed usage of GdkImlib

Added platform independent wxImage class Changed wxBitmap and wxImageList accordingly Correctted header text git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-24 17:12:05 +00:00
parent 0ab4b99cdf
commit 01111366c9
81 changed files with 1935 additions and 778 deletions
--- a/include/wx/gtk/accel.h
+++ b/include/wx/gtk/accel.h
@@ -3,7 +3,7 @@
 // Purpose:     wxAcceleratorTable class
 // Author:      Robert
 // Modified by:
-// RCS-ID:      
+// RCS-ID:      $id$
 // Copyright:   (c) Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -2,9 +2,8 @@
 // Name:        bitmap.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

@@ -20,6 +19,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"
+#include "wx/image.h"

 //-----------------------------------------------------------------------------
 // classes
@@ -60,7 +60,6 @@ class wxMask: public wxObject
 // wxBitmap
 //-----------------------------------------------------------------------------

-// CMB 20/5/98: added xbm constructor and GetBitmap() method
 class wxBitmap: public wxObject
 {
  DECLARE_DYNAMIC_CLASS(wxBitmap)
@@ -70,6 +69,7 @@ class wxBitmap: public wxObject
    wxBitmap();
    wxBitmap( int width, int height, int depth = -1 );
    wxBitmap( const char bits[], int width, int height, int depth = 1 );
+    wxBitmap( const wxImage &image );
    wxBitmap( char **bits );
    wxBitmap( const wxBitmap& bmp );
    wxBitmap( const wxBitmap* bmp );
@@ -79,6 +79,8 @@ class wxBitmap: public wxObject
    bool operator == ( const wxBitmap& bmp );
    bool operator != ( const wxBitmap& bmp );
    bool Ok() const;
+    
+    wxImage ConvertToImage() const;

    int GetHeight() const;
    int GetWidth() const;
@@ -90,8 +92,6 @@ class wxBitmap: public wxObject
    wxMask *GetMask() const;
    void SetMask( wxMask *mask );

-    void Resize( int height, int width );
-
    bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
    bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM);

@@ -104,10 +104,6 @@ class wxBitmap: public wxObject
    GdkPixmap *GetPixmap() const;
    GdkBitmap *GetBitmap() const;

-    void DestroyImage();
-    void RecreateImage();
-    void Render();
-
    // no data :-)
 };

--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -2,9 +2,8 @@
 // Name:        bmpbutton.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk/brush.h
+++ b/include/wx/gtk/brush.h
@@ -2,9 +2,8 @@
 // Name:        brush.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -2,9 +2,8 @@
 // Name:        button.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk/checkbox.h
+++ b/include/wx/gtk/checkbox.h
@@ -2,9 +2,8 @@
 // Name:        checkbox.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -2,9 +2,8 @@
 // Name:        choice.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -2,9 +2,8 @@
 // Name:        colour.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk1/accel.h
+++ b/include/wx/gtk1/accel.h
@@ -3,7 +3,7 @@
 // Purpose:     wxAcceleratorTable class
 // Author:      Robert
 // Modified by:
-// RCS-ID:      
+// RCS-ID:      $id$
 // Copyright:   (c) Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -2,9 +2,8 @@
 // Name:        bitmap.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

@@ -20,6 +19,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"
+#include "wx/image.h"

 //-----------------------------------------------------------------------------
 // classes
@@ -60,7 +60,6 @@ class wxMask: public wxObject
 // wxBitmap
 //-----------------------------------------------------------------------------

-// CMB 20/5/98: added xbm constructor and GetBitmap() method
 class wxBitmap: public wxObject
 {
  DECLARE_DYNAMIC_CLASS(wxBitmap)
@@ -70,6 +69,7 @@ class wxBitmap: public wxObject
    wxBitmap();
    wxBitmap( int width, int height, int depth = -1 );
    wxBitmap( const char bits[], int width, int height, int depth = 1 );
+    wxBitmap( const wxImage &image );
    wxBitmap( char **bits );
    wxBitmap( const wxBitmap& bmp );
    wxBitmap( const wxBitmap* bmp );
@@ -79,6 +79,8 @@ class wxBitmap: public wxObject
    bool operator == ( const wxBitmap& bmp );
    bool operator != ( const wxBitmap& bmp );
    bool Ok() const;
+    
+    wxImage ConvertToImage() const;

    int GetHeight() const;
    int GetWidth() const;
@@ -90,8 +92,6 @@ class wxBitmap: public wxObject
    wxMask *GetMask() const;
    void SetMask( wxMask *mask );

-    void Resize( int height, int width );
-
    bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
    bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM);

@@ -104,10 +104,6 @@ class wxBitmap: public wxObject
    GdkPixmap *GetPixmap() const;
    GdkBitmap *GetBitmap() const;

-    void DestroyImage();
-    void RecreateImage();
-    void Render();
-
    // no data :-)
 };

--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -2,9 +2,8 @@
 // Name:        bmpbutton.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -2,9 +2,8 @@
 // Name:        brush.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -2,9 +2,8 @@
 // Name:        button.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk1/checkbox.h
+++ b/include/wx/gtk1/checkbox.h
@@ -2,9 +2,8 @@
 // Name:        checkbox.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -2,9 +2,8 @@
 // Name:        choice.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -2,9 +2,8 @@
 // Name:        colour.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -0,0 +1,162 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        image.h
+// Purpose:     wxImage class
+// Author:      Robert Roebling
+// RCS-ID:      $Id$
+// Copyright:   (c) Robert Roebling
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_IMAGE_H_
+#define _WX_IMAGE_H_
+
+#ifdef __GNUG__
+#pragma interface "image.h"
+#endif
+
+#include "wx/setup.h"
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/gdicmn.h"
+
+//-----------------------------------------------------------------------------
+// classes
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxImageHandler;
+class WXDLLEXPORT wxPNGHandler;
+class WXDLLEXPORT wxBMPHandler;
+class WXDLLEXPORT wxImage;
+
+//-----------------------------------------------------------------------------
+// wxImageHandler
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxImageHandler: public wxObject
+{
+  DECLARE_DYNAMIC_CLASS(wxImageHandler)
+  
+public:
+  wxImageHandler() { m_name = ""; m_extension = ""; m_type = 0; }
+
+  virtual bool LoadFile( wxImage *image, const wxString& name );
+  virtual bool SaveFile( wxImage *image, const wxString& name );
+
+  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; }
+  
+protected:
+  wxString  m_name;
+  wxString  m_extension;
+  long      m_type;
+  
+};
+
+//-----------------------------------------------------------------------------
+// wxPNGHandler
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPNGHandler: public wxImageHandler
+{
+  DECLARE_DYNAMIC_CLASS(wxPNGHandler)
+  
+public:
+
+    inline wxPNGHandler()
+    {
+        m_name = "PNG file";
+        m_extension = "png";
+        m_type = wxBITMAP_TYPE_PNG;
+    };
+
+    virtual bool LoadFile( wxImage *image, const wxString& name );
+    virtual bool SaveFile( wxImage *image, const wxString& name );
+};
+
+//-----------------------------------------------------------------------------
+// wxBMPHandler
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxBMPHandler: public wxImageHandler
+{
+  DECLARE_DYNAMIC_CLASS(wxBMPHandler)
+  
+public:
+
+    inline wxBMPHandler()
+    {
+        m_name = "BMP file";
+        m_extension = "bmp";
+        m_type = wxBITMAP_TYPE_BMP;
+    };
+
+    virtual bool LoadFile( wxImage *image, const wxString& name );
+};
+//-----------------------------------------------------------------------------
+// wxImage
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxImage: public wxObject
+{
+  DECLARE_DYNAMIC_CLASS(wxImage)
+
+  friend class WXDLLEXPORT wxImageHandler;
+
+public:
+
+  wxImage();
+  wxImage( int width, int height );
+  wxImage( const wxString& name, long type = wxBITMAP_TYPE_PNG );
+  
+  wxImage( const wxImage& image );
+  wxImage( const wxImage* image );
+
+  void Create( int width, int height );
+  void Destroy();
+  
+  virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_PNG );
+  virtual bool SaveFile( const wxString& name, int type );
+
+  bool Ok() const;
+  int GetWidth() const;
+  int GetHeight() const;
+
+  char unsigned *GetData() const;
+  void SetData( char unsigned *data );
+  
+  void SetMaskColour( unsigned char r, unsigned char g, unsigned char b );
+  unsigned char GetMaskRed() const;
+  unsigned char GetMaskGreen() const;
+  unsigned char GetMaskBlue() const;
+  void SetMask( bool mask = TRUE );
+  bool HasMask() const;
+
+  inline wxImage& operator = (const wxImage& image) 
+    { if (*this == image) return (*this); Ref(image); return *this; }
+  inline bool operator == (const wxImage& image) 
+    { return m_refData == image.m_refData; }
+  inline bool operator != (const wxImage& image) 
+    { return m_refData != image.m_refData; }
+
+  static inline wxList& GetHandlers() { return sm_handlers; }
+  static void AddHandler( wxImageHandler *handler );
+  static void InsertHandler( wxImageHandler *handler );
+  static bool RemoveHandler( const wxString& name );
+  static wxImageHandler *FindHandler( const wxString& name );
+  static wxImageHandler *FindHandler( const wxString& extension, long imageType );
+  static wxImageHandler *FindHandler( long imageType );
+  
+  static void CleanUpHandlers();
+
+protected:
+
+  static wxList sm_handlers;
+  
+};
+
+#endif
+  // _WX_IMAGE_H_