Changes corresponding to patch #841324 from Ian Brown:

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

diff --git a/src/os2/palette.cpp b/src/os2/palette.cpp
index bf84af809ff06e8df0cdb13ce434aa9f47fa6d37..bd592c42e0bfaa4d5945952736b01a466684bea6 100644 (file)
--- a/src/os2/palette.cpp
+++ b/src/os2/palette.cpp
@@ -14,13 +14,16 @@
 
 #ifndef WX_PRECOMP
 #include <stdio.h>
 
 #ifndef WX_PRECOMP
 #include <stdio.h>

+#include "wx/defs.h"

 #include "wx/setup.h"
 #include "wx/setup.h"

+#include "wx/string.h"
+#include "wx/os2/private.h"

 #include "wx/palette.h"
 #include "wx/palette.h"

+#include "wx/app.h"

 #endif
 
 #define INCL_PM
 #define INCL_GPI
 #endif
 
 #define INCL_PM
 #define INCL_GPI

-#include <os2.h>

 
 #include "assert.h"
 
 
 #include "assert.h"
 


@@ -150,7 +153,8 @@ int wxPalette::GetPixel(
     //
     // Now loop through and find the matching entry
     //
     //
     // Now loop through and find the matching entry
     //

-    for (int i = 0; i < ulNumEntries; i++)
+    int                             i;
+    for (i = 0; i < ulNumEntries; i++)

     {
         if (pualTable[i] == ulRGB)
         {
     {
         if (pualTable[i] == ulRGB)
         {