safe macro expansion

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

diff --git a/include/wx/os2/pnghand.h b/include/wx/os2/pnghand.h
index 373ab863d0a9ff622beac22ff7f9e8a820aac46a..49c871a21986c46573ab92f420f31fa8d56d5d5c 100644 (file)
--- a/include/wx/os2/pnghand.h
+++ b/include/wx/os2/pnghand.h
@@ -18,18 +18,27 @@
 
 class WXDLLEXPORT 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