Remove __WXMGL__ tests from the samples too.

__WXMGL__ is not used any longer, remove it from the samples too.

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

diff --git a/samples/display/display.cpp b/samples/display/display.cpp
index 7172e2ae613cba4a9f6e6f551b45030348c26d9a..1016c703922cec051d933b45de16d280078be09d 100644 (file)
--- a/samples/display/display.cpp
+++ b/samples/display/display.cpp
@@ -36,7 +36,7 @@
 
 
 // the application icon (under Windows and OS/2 it is in resources)
 
 
 // the application icon (under Windows and OS/2 it is in resources)

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/except/except.cpp b/samples/except/except.cpp
index 7ea7b7b159844b8a5e059159f417fdf3822f72be..e4019f5e60196087cdbf99dc1aa483657a45a0ba 100644 (file)
--- a/samples/except/except.cpp
+++ b/samples/except/except.cpp
@@ -53,7 +53,7 @@
 // ----------------------------------------------------------------------------
 
 // the application icon (under Windows and OS/2 it is in resources)
 // ----------------------------------------------------------------------------
 
 // the application icon (under Windows and OS/2 it is in resources)

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index a75cd3cadd3b6c87cb4601c51c1d97ec36285b1a..b93aabe82519ae27bb50b7119357add90b8aa039 100644 (file)
--- a/samples/listctrl/listtest.h
+++ b/samples/listctrl/listtest.h
@@ -11,7 +11,7 @@
 
 // not all ports have support for EVT_CONTEXT_MENU yet, don't define
 // USE_CONTEXT_MENU for those which don't
 
 // not all ports have support for EVT_CONTEXT_MENU yet, don't define
 // USE_CONTEXT_MENU for those which don't

-#if defined(__WXMOTIF__) || defined(__WXPM__) || defined(__WXX11__) || defined(__WXMGL__)
+#if defined(__WXMOTIF__) || defined(__WXPM__) || defined(__WXX11__)

     #define USE_CONTEXT_MENU 0
 #else
     #define USE_CONTEXT_MENU 1
     #define USE_CONTEXT_MENU 0
 #else
     #define USE_CONTEXT_MENU 1

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index 4c3b8dc902eab59f958cdbc67ba49341dcd751fe..6797e8d30a35cfabcc9655d5399d95b540fd3231 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -41,7 +41,7 @@
 
 // not all ports have support for EVT_CONTEXT_MENU yet, don't define
 // USE_CONTEXT_MENU for those which don't
 
 // not all ports have support for EVT_CONTEXT_MENU yet, don't define
 // USE_CONTEXT_MENU for those which don't

-#if defined(__WXMOTIF__) || defined(__WXPM__) || defined(__WXX11__) || defined(__WXMGL__)
+#if defined(__WXMOTIF__) || defined(__WXPM__) || defined(__WXX11__)

     #define USE_CONTEXT_MENU 0
 #else
     #define USE_CONTEXT_MENU 1
     #define USE_CONTEXT_MENU 0
 #else
     #define USE_CONTEXT_MENU 1

diff --git a/samples/render/render.cpp b/samples/render/render.cpp
index db50a5663b456fd821e3ec9acd1f7031ba3a4fce..ae5c3bc4c71e1487f50812dd24d9b32387aafee6 100644 (file)
--- a/samples/render/render.cpp
+++ b/samples/render/render.cpp
@@ -47,7 +47,7 @@
 // ----------------------------------------------------------------------------
 
 // the application icon (under Windows and OS/2 it is in resources)
 // ----------------------------------------------------------------------------
 
 // the application icon (under Windows and OS/2 it is in resources)

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp
index abae8a45cef0ae0f991434e32c3cd04bb9f5f90e..e44158e9958991693b531b6f1e780735219d349f 100644 (file)
--- a/samples/sound/sound.cpp
+++ b/samples/sound/sound.cpp
@@ -36,7 +36,7 @@
 // ----------------------------------------------------------------------------
 
 // the application icon (under Windows and OS/2 it is in resources)
 // ----------------------------------------------------------------------------
 
 // the application icon (under Windows and OS/2 it is in resources)

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index cf7ba7a0c1c67da0b19f5fc49eeaf5cf2d413e88..d8934e9a6e3499084c5f78debc444fd8d734aead 100644 (file)
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -29,7 +29,7 @@
 #endif
 
 // the application icon (under Windows and OS/2 it is in resources)
 #endif
 
 // the application icon (under Windows and OS/2 it is in resources)

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif