fix wxBitmapComboBox Gtk-CRITICAL assertion `GTK_IS_ENTRY (entry)' failed

[wxWidgets.git] / include / wx / os2 / pnghand.h

diff --git a/include/wx/os2/pnghand.h b/include/wx/os2/pnghand.h
index 373ab863d0a9ff622beac22ff7f9e8a820aac46a..0d78afc7a0a657ebf438928824371c2dda3e53f0 100644 (file)
--- a/include/wx/os2/pnghand.h
+++ b/include/wx/os2/pnghand.h
@@ -1,37 +1,41 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        pnghand.h
+// Name:        wx/os2/pnghand.h
 // Purpose:     PNG bitmap handler
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Microsoft, Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma interface "pnghand.h"
-#endif
-
 #ifndef _WX_PNGHAND_H_
 #define _WX_PNGHAND_H_
 
-class WXDLLEXPORT wxPNGFileHandler: public wxBitmapHandler
+class WXDLLIMPEXP_CORE wxPNGFileHandler: public wxBitmapHandler
 {
-  DECLARE_DYNAMIC_CLASS(wxPNGFileHandler)
+    DECLARE_DYNAMIC_CLASS(wxPNGFileHandler)
 public:
-  inline wxPNGFileHandler(void)
-  {
-       m_name = "PNG bitmap file";
-       m_extension = "bmp";
-       m_type = wxBITMAP_TYPE_PNG;
-  };
+    inline wxPNGFileHandler(void)
+    {
+        m_sName = "PNG bitmap file";
+        m_sExtension = "bmp";
+        m_lType = wxBITMAP_TYPE_PNG;
+    }
 
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth, int desiredHeight);
-  virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
+    virtual bool LoadFile( wxBitmap*       pBitmap
+                          ,const wxString& rName
+                          ,HPS             hPs
+                          ,long            lFlags
+                          ,int             nDesiredWidth
+                          ,int             nDesiredHeight
+                         );
+    virtual bool SaveFile( wxBitmap*        pBitmap
+                          ,const wxString&  rName
+                          ,int              nType
+                          ,const wxPalette* pPalette = NULL
+                         );
 };
 
 #endif
-  // _WX_PNGHAND_H_
-
+    // _WX_PNGHAND_H_