Took out somebody's hard coded path (j:\dev\something...) and put back

[wxWidgets.git] / src / xpm / xpm34.h

diff --git a/src/xpm/xpm34.h b/src/xpm/xpm34.h
index 1f7c046197db0d861b5d655e23aa1ed81f89543c..94071dec63a266295d9d86d8dd608ba03166d165 100644 (file)
--- a/src/xpm/xpm34.h
+++ b/src/xpm/xpm34.h
@@ -43,6 +43,10 @@
 #if (defined(_WINDOWS) || defined(__WXMSW__) || defined(WIN32)) && !defined(FOR_MSW)
 #define FOR_MSW
 #endif
 #if (defined(_WINDOWS) || defined(__WXMSW__) || defined(WIN32)) && !defined(FOR_MSW)
 #define FOR_MSW
 #endif

+/* Piggyback on MSW for now */
+#if (defined(__OS2__) || defined(__WXPM__) || defined(OS232)) && !defined(FOR_MSW)
+#define FOR_MSW
+#endif

 
 /*
  * first some identification numbers:
 
 /*
  * first some identification numbers:


@@ -271,7 +275,7 @@ extern "C" {
  * arguments to be corrupted espec. in XpmWriteFileFromXpmImage.
  * So, define all prototypes explicitly.
  */
  * arguments to be corrupted espec. in XpmWriteFileFromXpmImage.
  * So, define all prototypes explicitly.
  */

-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__OS2__)

 
 /* FOR_MSW, all ..Pixmap.. are excluded, only the ..XImage.. are used */
 
 
 /* FOR_MSW, all ..Pixmap.. are excluded, only the ..XImage.. are used */
 


@@ -511,7 +515,7 @@ extern "C" {
                                            XpmInfo *info));
 
 #endif // _MSC_VER
                                            XpmInfo *info));
 
 #endif // _MSC_VER

-                                           
+                                       

 #ifdef __cplusplus
 } /* for C++ V2.0 */
 #endif
 #ifdef __cplusplus
 } /* for C++ V2.0 */
 #endif