Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

[wxWidgets.git] / src / os2 / palette.cpp

diff --git a/src/os2/palette.cpp b/src/os2/palette.cpp
index 8012364200fa3529d9b2df1a8a33e918aac8f039..b28c4307d2939d54abd2e0f08fefaf60f35370c3 100644 (file)
--- a/src/os2/palette.cpp
+++ b/src/os2/palette.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        palette.cpp
+// Name:        src/os2/palette.cpp
 // Purpose:     wxPalette
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -14,13 +14,16 @@
 
 #ifndef WX_PRECOMP
 #include <stdio.h>
+#include "wx/defs.h"
 #include "wx/setup.h"
+#include "wx/string.h"
+#include "wx/os2/private.h"
 #include "wx/palette.h"
+#include "wx/app.h"
 #endif
 
 #define INCL_PM
 #define INCL_GPI
-#include <os2.h>
 
 #include "assert.h"
 
@@ -65,24 +68,20 @@ wxPalette::~wxPalette()
 {
 } // end of wxPalette::~wxPalette
 
-bool wxPalette::FreeResource(
-  bool                              bForce
-)
+bool wxPalette::FreeResource( bool WXUNUSED(bForce) )
 {
     if ( M_PALETTEDATA && M_PALETTEDATA->m_hPalette)
     {
         ::GpiSelectPalette(M_PALETTEDATA->m_hPS, NULLHANDLE);
         ::GpiDeletePalette((HPAL)M_PALETTEDATA->m_hPalette);
     }
-    return TRUE;
+    return true;
 } // end of wxPalette::FreeResource
 
-bool wxPalette::Create(
-  int                               n
-, const unsigned char*              pRed
-, const unsigned char*              pGreen
-, const unsigned char*              pBlue
-)
+bool wxPalette::Create( int n,
+                        const unsigned char* pRed,
+                        const unsigned char* pGreen,
+                        const unsigned char* pBlue )
 {
     PULONG                          pualTable;
 
@@ -91,7 +90,7 @@ bool wxPalette::Create(
     m_refData = new wxPaletteRefData;
     pualTable = new ULONG[n];
     if (!pualTable)
-        return(FALSE);
+        return false;
 
     for (int i = 0; i < n; i ++)
     {
@@ -104,25 +103,23 @@ bool wxPalette::Create(
                                                                ,pualTable
                                                               );
     delete [] pualTable;
-    return TRUE;
+    return true;
 } // end of wxPalette::Create
 
-int wxPalette::GetPixel(
-  const unsigned char               cRed
-, const unsigned char               cGreen
-, const unsigned char               cBlue
-) const
+int wxPalette::GetPixel( unsigned char cRed,
+                         unsigned char cGreen,
+                         unsigned char cBlue) const
 {
-    bool                            bFound = FALSE;
-    PULONG                          pualTable = NULL;
-    ULONG                           ulNumEntries;
-    ULONG                           ulRGB = (PC_RESERVED * 16777216) +
-                                            ((int)cRed * 65536) +
-                                            ((int)cGreen * 256) +
-                                             (int)cBlue;
+    bool    bFound = false;
+    PULONG  pualTable = NULL;
+    ULONG   ulNumEntries;
+    ULONG   ulRGB = (PC_RESERVED * 16777216) +
+                    ((int)cRed * 65536) +
+                    ((int)cGreen * 256) +
+                    (int)cBlue;
 
     if (!m_refData)
-        return FALSE;
+        return wxNOT_FOUND;
 
     //
     // Get number of entries first
@@ -150,36 +147,34 @@ int wxPalette::GetPixel(
     //
     // Now loop through and find the matching entry
     //
-    int                             i;
+    ULONG i;
     for (i = 0; i < ulNumEntries; i++)
     {
         if (pualTable[i] == ulRGB)
         {
-            bFound = TRUE;
+            bFound = true;
             break;
         }
     }
     if (!bFound)
-        return 0;
+        return wxNOT_FOUND;
     return (i + 1);
 } // end of wxPalette::GetPixel
 
-bool wxPalette::GetRGB(
-  int                               nIndex
-, unsigned char*                    pRed
-, unsigned char*                    pGreen
-, unsigned char*                    pBlue
-) const
+bool wxPalette::GetRGB( int nIndex,
+                        unsigned char* pRed,
+                        unsigned char* pGreen,
+                        unsigned char* pBlue) const
 {
     PULONG                          pualTable = NULL;
     RGB2                            vRGB;
     ULONG                           ulNumEntries;
 
     if (!m_refData)
-        return FALSE;
+        return false;
 
     if (nIndex < 0 || nIndex > 255)
-        return FALSE;
+        return false;
     //
     // Get number of entries first
     //
@@ -208,7 +203,7 @@ bool wxPalette::GetRGB(
     *pBlue  = vRGB.bBlue;
     *pGreen = vRGB.bGreen;
     *pRed   = vRGB.bRed;
-    return TRUE;
+    return true;
 } // end of wxPalette::GetRGB
 
 void wxPalette::SetHPALETTE(
@@ -231,4 +226,3 @@ void wxPalette::SetPS(
     ::GpiSelectPalette(M_PALETTEDATA->m_hPS, M_PALETTEDATA->m_hPalette);
     M_PALETTEDATA->m_hPS = hPS;
 } // end of wxPalette::SetHPALETTE
-