Remove wxGTK1 port and GPE support

Remove the port files and references to it from the common headers and
elsewhere.

Also remove GPE (GNOME PDA Environment) support as libgpewidget is
unmaintained since 2006 or so and has never been really used.

Use __WXGTK__ to test for any version of wxGTK now. Still define
__WXGTK20__ for compatibility, but always define it now and don't test
for it in the library code.

samples/access/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/animate/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/archive/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/artprov/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/aui/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/calendar/calendar.cpp

@@ -349,7 +349,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
 
     EVT_UPDATE_UI(Calendar_Cal_SeqMonth, MyFrame::OnUpdateUIGenericOnly)
-#ifdef __WXGTK20__
+#ifdef __WXGTK__
     EVT_UPDATE_UI(Calendar_Cal_AutoWeekday, MyFrame::OnUpdateUIGenericOnly)
     EVT_UPDATE_UI(Calendar_Cal_Sunday, MyFrame::OnUpdateUIGenericOnly)
     EVT_UPDATE_UI(Calendar_Cal_Monday, MyFrame::OnUpdateUIGenericOnly)

samples/calendar/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/caret/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/clipboard/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/collpane/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/combo/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/config/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/console/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/dataview/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/debugrpt/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/dialogs/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/dialup/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/display/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/dll/makefile.unx

@@ -13,7 +13,7 @@
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/dnd/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/docview/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/dragimag/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/drawing/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/erase/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/event/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/except/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/exec/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/font/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/fswatcher/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/grid/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/help/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/htlbox/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/html/about/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/html/help/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/html/helpview/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/html/printing/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/html/test/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/html/virtual/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/html/widget/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/html/zip/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/image/canvas.cpp

@@ -546,7 +546,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     memdc.SetBrush( *wxWHITE_BRUSH );
     memdc.DrawRectangle( 0,0,60,50 );
     memdc.SetTextForeground( *wxBLACK );
-#ifndef __WXGTK20__
+#ifndef __WXGTK__
     // I cannot convince GTK2 to draw into mono bitmaps
     memdc.DrawText( "Hi!", 5, 5 );
 #endif

samples/image/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/internat/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/ipc/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/joytest/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/keyboard/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/layout/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/listctrl/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/mdi/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/mediaplayer/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/memcheck/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/menu/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/minimal/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/nativdlg/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/notebook/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/notebook/notebook.cpp

@@ -37,7 +37,7 @@ bool MyApp::OnInit()
     if ( !wxApp::OnInit() )
         return false;
 
-#ifdef __WXGTK20__
+#ifdef __WXGTK__
     // Many version of wxGTK generate spurious diagnostic messages when
     // destroying wxNotebook (or removing pages from it), allow wxWidgets to
     // suppress them.

samples/oleauto/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/opengl/cube/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/opengl/isosurf/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/opengl/penguin/makefile.unx

@@ -31,7 +31,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/opengl/pyramid/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/ownerdrw/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/popup/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/power/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/preferences/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/printing/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/propgrid/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/regtest/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/render/makefile.unx

@@ -28,7 +28,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/ribbon/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/richtext/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/sashtest/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/scroll/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/secretstore/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/shaped/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/sockets/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/sound/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/splash/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/splash/splash.cpp

@@ -150,7 +150,7 @@ bool MyApp::OnInit()
             wxSIMPLE_BORDER|wxSTAY_ON_TOP);
     }
 
-#if !defined(__WXGTK20__)
+#if !defined(__WXGTK__)
     // we don't need it at least on wxGTK with GTK+ 2.12.9
     wxYield();
 #endif

samples/splitter/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/statbar/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/stc/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/svg/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/taborder/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/taskbar/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/taskbarbutton/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/text/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/thread/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/toolbar/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/treectrl/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/treelist/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/typetest/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/uiaction/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/validate/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/vscroll/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/webrequest/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/webview/makefile.unx

@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
-# Port of the wx library to build against [gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
+# Port of the wx library to build against [gtk2,msw,x11,osx_cocoa,osx_carbon,dfb]
 WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]

samples/widgets/clrpicker.cpp

@@ -121,7 +121,7 @@ wxEND_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-#if defined(__WXGTK20__)
+#if defined(__WXGTK__)
     #define FAMILY_CTRLS NATIVE_CTRLS
 #else
     #define FAMILY_CTRLS GENERIC_CTRLS

samples/widgets/dirpicker.cpp

@@ -124,7 +124,7 @@ wxEND_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-#if defined(__WXGTK20__)
+#if defined(__WXGTK__)
     #define FAMILY_CTRLS NATIVE_CTRLS
 #else
     #define FAMILY_CTRLS GENERIC_CTRLS

samples/widgets/filepicker.cpp

@@ -141,7 +141,7 @@ wxEND_EVENT_TABLE()
 // implementation
 // ============================================================================
 
-#if defined(__WXGTK20__)
+#if defined(__WXGTK__)
     #define FAMILY_CTRLS NATIVE_CTRLS
 #else
     #define FAMILY_CTRLS GENERIC_CTRLS