changes to match listctrl.h changes (forgot to commit yesterday, sorry)

[wxWidgets.git] / src / mac / pnghand.cpp

diff --git a/src/mac/pnghand.cpp b/src/mac/pnghand.cpp
index 61344392716ac2244067b786d571a615d8c173e4..193676f19550ea1cc0224d8b51427e66e0de8ec3 100644 (file)
--- a/src/mac/pnghand.cpp
+++ b/src/mac/pnghand.cpp
@@ -10,15 +10,15 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "pngread.h"
-#pragma implementation "pnghand.h"
+#  pragma implementation "pngread.h"
+#  pragma implementation "pnghand.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+#  pragma hdrstop

 #endif
 
 #include <stdlib.h>
 #endif
 
 #include <stdlib.h>


@@ -31,7 +31,7 @@
 #   include <fstream>
 #endif
 
 #   include <fstream>
 #endif
 

-#ifndef __WXMAC_X__
+#ifndef __DARWIN__

 #  include <windows.h>
 #endif
 #include "wx/msgdlg.h"
 #  include <windows.h>
 #endif
 #include "wx/msgdlg.h"


@@ -79,7 +79,7 @@ wxPNGReader::wxPNGReader(void)
 
   lpbi = NULL;
   bgindex = -1;
 
   lpbi = NULL;
   bgindex = -1;

-  Palette = 0;
+  m_palette = 0;

   imageOK = FALSE;
 }
 
   imageOK = FALSE;
 }
 


@@ -91,7 +91,7 @@ wxPNGReader::wxPNGReader ( char* ImageFileName )
 
   Width = 0; Height = 0;       //  Dimensions
   Depth = 0;           // (bits x pixel)
 
   Width = 0; Height = 0;       //  Dimensions
   Depth = 0;           // (bits x pixel)

-  ColorType = 0;        // Bit 1 = Palette used
+  ColorType = 0;        // Bit 1 = m_palette used

                   // Bit 2 = Color used
                   // Bit 3 = Alpha used
 
                   // Bit 2 = Color used
                   // Bit 3 = Alpha used
 


@@ -99,7 +99,7 @@ wxPNGReader::wxPNGReader ( char* ImageFileName )
 
   lpbi = NULL;
   bgindex = -1;
 
   lpbi = NULL;
   bgindex = -1;

-  Palette = 0;
+  m_palette = 0;

 
   imageOK = ReadFile (ImageFileName);
 }
 
   imageOK = ReadFile (ImageFileName);
 }


@@ -109,10 +109,10 @@ wxPNGReader::Create(int width, int height, int depth, int colortype)
 {
   Width = width; Height = height; Depth = depth;
   ColorType = (colortype>=0) ? colortype: ((Depth>8) ? COLORTYPE_COLOR: 0);
 {
   Width = width; Height = height; Depth = depth;
   ColorType = (colortype>=0) ? colortype: ((Depth>8) ? COLORTYPE_COLOR: 0);

-  delete Palette;
+  delete m_palette;

   delete[] RawImage ;
   RawImage = 0;
   delete[] RawImage ;
   RawImage = 0;

-  Palette = 0;
+  m_palette = 0;

 
   if (lpbi)  
   {
 
   if (lpbi)  
   {


@@ -137,7 +137,7 @@ wxPNGReader::~wxPNGReader ( )
   if (lpbi)  {
        wxMacDestroyGWorld( lpbi ) ;
   }
   if (lpbi)  {
        wxMacDestroyGWorld( lpbi ) ;
   }

-  delete Palette;
+  delete m_palette;

 }
 
 
 }
 
 


@@ -154,10 +154,10 @@ bool wxPNGReader::GetRGB(int x, int y, byte* r, byte* g, byte* b)
 {
   if (!Inside(x, y)) return FALSE;
 
 {
   if (!Inside(x, y)) return FALSE;
 

-  if (Palette) {
-   return Palette->GetRGB(GetIndex(x, y), r, g, b);
+  if (m_palette) {
+   return m_palette->GetRGB(GetIndex(x, y), r, g, b);

 /*   PALETTEENTRY entry;
 /*   PALETTEENTRY entry;

-   ::GetPaletteEntries((HPALETTE) Palette->GetHPALETTE(), GetIndex(x, y), 1, &entry);
+   ::GetPaletteEntries((HPALETTE) m_palette->GetHPALETTE(), GetIndex(x, y), 1, &entry);

    *r = entry.peRed;
    *g = entry.peGreen;
    *b = entry.peBlue;  */
    *r = entry.peRed;
    *g = entry.peGreen;
    *b = entry.peBlue;  */


@@ -187,8 +187,8 @@ bool wxPNGReader::SetRGB(int x, int y, byte r, byte g, byte b)
 
   if (ColorType & COLORTYPE_PALETTE)
   {
 
   if (ColorType & COLORTYPE_PALETTE)
   {

-   if (!Palette) return FALSE;
-   SetIndex(x, y, Palette->GetPixel(r, g, b));
+   if (!m_palette) return FALSE;
+   SetIndex(x, y, m_palette->GetPixel(r, g, b));

 
   } else {
    ImagePointerType ImagePointer = RawImage + EfeWidth*y + (x*Depth >> 3);
 
   } else {
    ImagePointerType ImagePointer = RawImage + EfeWidth*y + (x*Depth >> 3);


@@ -202,37 +202,37 @@ bool wxPNGReader::SetRGB(int x, int y, byte r, byte g, byte b)
 
 bool wxPNGReader::SetPalette(wxPalette* colourmap)
 {
 
 bool wxPNGReader::SetPalette(wxPalette* colourmap)
 {

-  delete Palette ;
+  delete m_palette ;

   if (!colourmap)
    return FALSE;
   ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
   if (!colourmap)
    return FALSE;
   ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);

-  Palette = new wxPalette( *colourmap );
+  m_palette = new wxPalette( *colourmap );

        return true ;
        return true ;

-//  return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
+//  return (DibSetUsage(lpbi, (HPALETTE) m_palette->GetHPALETTE(), WXIMA_COLORS ) != 0);

 }
 
 bool
 wxPNGReader::SetPalette(int n, byte *r, byte *g, byte *b)
 {
 }
 
 bool
 wxPNGReader::SetPalette(int n, byte *r, byte *g, byte *b)
 {

-  delete Palette ;
-  Palette = new wxPalette();
-  if (!Palette)
+  delete m_palette ;
+  m_palette = new wxPalette();
+  if (!m_palette)

    return FALSE;
 
   if (!g) g = r;
   if (!b) b = g;
    return FALSE;
 
   if (!g) g = r;
   if (!b) b = g;

-  Palette->Create(n, r, g, b);
+  m_palette->Create(n, r, g, b);

   ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
        return true ;
   ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
        return true ;

-//    return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
+//    return (DibSetUsage(lpbi, (HPALETTE) m_palette->GetHPALETTE(), WXIMA_COLORS ) != 0);

 }
 
 bool
 wxPNGReader::SetPalette(int n, rgb_color_struct *rgb_struct)
 {
 }
 
 bool
 wxPNGReader::SetPalette(int n, rgb_color_struct *rgb_struct)
 {

-  delete Palette ;
-  Palette = new wxPalette();
-  if (!Palette)
+  delete m_palette ;
+  m_palette = new wxPalette();
+  if (!m_palette)

    return FALSE;
 
   byte r[256], g[256], b[256];
    return FALSE;
 
   byte r[256], g[256], b[256];


@@ -249,10 +249,10 @@ wxPNGReader::SetPalette(int n, rgb_color_struct *rgb_struct)
   if (bgindex != -1)
     r[bgindex] = g[bgindex] = b[bgindex] = 0;
 
   if (bgindex != -1)
     r[bgindex] = g[bgindex] = b[bgindex] = 0;
 

-  Palette->Create(n, r, g, b);
+  m_palette->Create(n, r, g, b);

   ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
        return true ;
   ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
        return true ;

-//    return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
+//    return (DibSetUsage(lpbi, (HPALETTE) m_palette->GetHPALETTE(), WXIMA_COLORS ) != 0);

 }
 
 void wxPNGReader::NullData()
 }
 
 void wxPNGReader::NullData()


@@ -260,9 +260,9 @@ void wxPNGReader::NullData()
   if (lpbi)  {
        wxMacDestroyGWorld( lpbi ) ;
   }
   if (lpbi)  {
        wxMacDestroyGWorld( lpbi ) ;
   }

-  delete Palette;
+  delete m_palette;

   lpbi = NULL;
   lpbi = NULL;

-  Palette = NULL;
+  m_palette = NULL;

 }
 
 wxBitmap* wxPNGReader::GetBitmap(void)
 }
 
 wxBitmap* wxPNGReader::GetBitmap(void)


@@ -285,8 +285,8 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
       bitmap->SetWidth(GetWidth());
       bitmap->SetHeight(GetHeight());
       bitmap->SetDepth(GetDepth());
       bitmap->SetWidth(GetWidth());
       bitmap->SetHeight(GetHeight());
       bitmap->SetDepth(GetDepth());

-      if ( GetDepth() > 1 && Palette )
-        bitmap->SetPalette(*Palette);
+      if ( GetDepth() > 1 && m_palette )
+        bitmap->SetPalette(*m_palette);

       bitmap->SetOk(TRUE);
 
 
       bitmap->SetOk(TRUE);
 
 


@@ -317,9 +317,9 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
         ReleaseDC(NULL, dc2);
         HBITMAP oldBitmap = (HBITMAP) ::SelectObject(dc, tmpBitmap);
 
         ReleaseDC(NULL, dc2);
         HBITMAP oldBitmap = (HBITMAP) ::SelectObject(dc, tmpBitmap);
 

-        if ( Palette )
+        if ( m_palette )

         {
         {

-            HPALETTE oldPal = ::SelectPalette(dc, (HPALETTE) Palette->GetHPALETTE(), FALSE);
+            HPALETTE oldPal = ::SelectPalette(dc, (HPALETTE) m_palette->GetHPALETTE(), FALSE);

         ::RealizePalette(dc);
         }
 
         ::RealizePalette(dc);
         }
 


@@ -337,8 +337,8 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
           bitmap->SetWidth(GetWidth());
           bitmap->SetHeight(GetHeight());
           bitmap->SetDepth(GetDepth());
           bitmap->SetWidth(GetWidth());
           bitmap->SetHeight(GetHeight());
           bitmap->SetDepth(GetDepth());

-          if ( GetDepth() > 1 && Palette )
-            bitmap->SetPalette(*Palette);
+          if ( GetDepth() > 1 && m_palette )
+            bitmap->SetPalette(*m_palette);

           bitmap->SetOk(TRUE);
 
 
           bitmap->SetOk(TRUE);
 
 


@@ -414,7 +414,8 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
   wxPNGReaderIter iter(this);
 
   /* open the file */
   wxPNGReaderIter iter(this);
 
   /* open the file */

-  fp = fopen(wxUnix2MacFilename( ImageFileName ), "rb");
+  fp = fopen( ImageFileName , "rb" );
+

   if (!fp)
     return FALSE;
 
   if (!fp)
     return FALSE;
 


@@ -822,7 +823,7 @@ bool wxPNGReader::SaveXPM(char *filename, char *name)
     if ( !GetPalette() )
         return FALSE;
 
     if ( !GetPalette() )
         return FALSE;
 

-    ofstream str(filename);
+    wxSTD ofstream str(filename);

     if ( str.bad() )
         return FALSE;
 
     if ( str.bad() )
         return FALSE;
 


@@ -886,7 +887,7 @@ bool wxPNGFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long fla
         return FALSE;
 }
 
         return FALSE;
 }
 

-bool wxPNGFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *pal)
+bool wxPNGFileHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *pal)

 {
     return FALSE;
 }
 {
     return FALSE;
 }