From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 15 Jan 2012 18:50:35 +0000 (+0000)
Subject: Remove __WXMGL__ tests from the samples too.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f2012fa63905c4b1e2a144a56e48097a46e3f3e1

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 7172e2ae61..1016c70392 100644
--- 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)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
     #include "../sample.xpm"
 #endif
 
diff --git a/samples/except/except.cpp b/samples/except/except.cpp
index 7ea7b7b159..e4019f5e60 100644
--- 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)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
     #include "../sample.xpm"
 #endif
 
diff --git a/samples/listctrl/listtest.h b/samples/listctrl/listtest.h
index a75cd3cadd..b93aabe825 100644
--- 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
-#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
diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index 4c3b8dc902..6797e8d30a 100644
--- 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
-#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
diff --git a/samples/render/render.cpp b/samples/render/render.cpp
index db50a5663b..ae5c3bc4c7 100644
--- 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)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
     #include "../sample.xpm"
 #endif
 
diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp
index abae8a45ce..e44158e995 100644
--- 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)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
     #include "../sample.xpm"
 #endif
 
diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index cf7ba7a0c1..d8934e9a6e 100644
--- 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)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
     #include "../sample.xpm"
 #endif