Fixed #pragma interface/implementation handling for old compilers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/event.h b/include/wx/event.h
index be318f06198e12befe81ccd4ac1a9de8ba380a01..f40381f6040ec808c34dee843a496086f4cbbc91 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -12,7 +12,14 @@
 #ifndef _WX_EVENT_H__
 #define _WX_EVENT_H__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.
     #pragma interface "event.h"
 #endif
 

diff --git a/include/wx/fs_mem.h b/include/wx/fs_mem.h
index be005401ed43ca8836f78c1afd29cc56c102522b..9a46b264f40b78f6801a0c4ca96ab789d5f28fdc 100644 (file)
--- a/include/wx/fs_mem.h
+++ b/include/wx/fs_mem.h
@@ -9,7 +9,14 @@
 #ifndef _WX_FS_MEM_H_
 #define _WX_FS_MEM_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.
 #pragma interface "fs_mem.h"
 #endif
 

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index f5bee59ac8d1051faf5dd480c69e92a8e29beecd..cab47aa087ab7814229a37c66cc15ead42b80dd5 100755 (executable)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -16,7 +16,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.
     #pragma interface "msgout.h"
 #endif
 

diff --git a/include/wx/utils.h b/include/wx/utils.h
index abbbad94f26ca8675e4fbda37952a69ba72df637..7dd95c8923cced54e063ebdf3257478ea348475f 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -16,7 +16,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.
     #pragma interface "utils.h"
 #endif
 

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 414390d351098c57a24f9788aa4b20d9930d2aeb..e734fb9e83c7f1b9d86c0295adabdf830fb2969c 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -17,7 +17,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.
     #pragma implementation "event.h"
 #endif
 

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 7fd15699908a91f99b64e47d712cafbcca789742..37a272bbdc8948d8903b05948c9bf79ced45d4d5 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -7,7 +7,14 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.
 #pragma implementation "fs_mem.h"
 #endif
 

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 3c824301395fc9c26cb7ca96ea805c9a5b8be7cc..961e0c4614838533e3b284fa1b3d438ea6b18d36 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -17,7 +17,14 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.
     #pragma implementation "msgout.h"
 #endif
 

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 9c60b60e457a91d9386d835fa344910abfe6df5e..449bafe65fea735a240a8776d68455f8c0dd87dc 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -17,7 +17,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
+// Some older compilers (such as EMX) cannot handle
+// #pragma interface/implementation correctly, iff 
+// #pragma implementation is used in _two_ translation
+// units (as created by e.g. event.cpp compiled for
+// libwx_base and event.cpp compiled for libwx_gui_core).
+// So we must not use those pragmas for those compilers in
+// such files.
     #pragma implementation "utils.h"
 #endif