From 8ef94bfc25eb21f1d3fa93b3d55c5a1ca18d8e62 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Mon, 23 Jan 2006 02:28:01 +0000
Subject: [PATCH] Remove GTK2 specific prototypes from wx/include/gtk1.
 wx/gtk1/hdr into the header comments instead of wx/gtk/hdr or hdr

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/gtk1/accel.h    |  2 +-
 include/wx/gtk1/app.h      |  6 ++--
 include/wx/gtk1/bitmap.h   | 27 +-------------
 include/wx/gtk1/bmpbuttn.h |  2 +-
 include/wx/gtk1/brush.h    |  2 +-
 include/wx/gtk1/button.h   |  4 +--
 include/wx/gtk1/checkbox.h |  9 ++---
 include/wx/gtk1/checklst.h |  4 +--
 include/wx/gtk1/choice.h   |  2 +-
 include/wx/gtk1/clipbrd.h  |  4 +--
 include/wx/gtk1/colordlg.h |  4 +--
 include/wx/gtk1/colour.h   |  2 +-
 include/wx/gtk1/combobox.h |  2 +-
 include/wx/gtk1/control.h  |  2 +-
 include/wx/gtk1/cursor.h   |  2 +-
 include/wx/gtk1/dataform.h |  2 +-
 include/wx/gtk1/dataobj.h  |  2 +-
 include/wx/gtk1/dataobj2.h |  2 +-
 include/wx/gtk1/dc.h       |  2 +-
 include/wx/gtk1/dcclient.h |  9 +----
 include/wx/gtk1/dcmemory.h |  2 +-
 include/wx/gtk1/dcscreen.h |  2 +-
 include/wx/gtk1/dialog.h   |  2 +-
 include/wx/gtk1/dnd.h      |  2 +-
 include/wx/gtk1/filedlg.h  |  2 +-
 include/wx/gtk1/font.h     |  4 +--
 include/wx/gtk1/fontdlg.h  |  2 +-
 include/wx/gtk1/frame.h    |  6 ++--
 include/wx/gtk1/gauge.h    |  6 ++--
 include/wx/gtk1/gdiobj.h   |  2 +-
 include/wx/gtk1/glcanvas.h |  2 +-
 include/wx/gtk1/icon.h     |  2 +-
 include/wx/gtk1/listbox.h  |  2 +-
 include/wx/gtk1/mdi.h      |  2 +-
 include/wx/gtk1/menu.h     |  4 +--
 include/wx/gtk1/menuitem.h |  2 +-
 include/wx/gtk1/minifram.h |  4 +--
 include/wx/gtk1/notebook.h |  2 +-
 include/wx/gtk1/pen.h      |  4 +--
 include/wx/gtk1/popupwin.h |  2 +-
 include/wx/gtk1/private.h  | 74 +++++++-------------------------------
 include/wx/gtk1/radiobox.h |  2 +-
 include/wx/gtk1/radiobut.h |  2 +-
 include/wx/gtk1/region.h   |  2 +-
 include/wx/gtk1/scrolbar.h |  4 +--
 include/wx/gtk1/scrolwin.h |  2 +-
 include/wx/gtk1/slider.h   |  4 +--
 include/wx/gtk1/spinbutt.h |  4 +--
 include/wx/gtk1/spinctrl.h |  6 ++--
 include/wx/gtk1/statbmp.h  |  4 +--
 include/wx/gtk1/statbox.h  |  4 +--
 include/wx/gtk1/statline.h |  2 +-
 include/wx/gtk1/stattext.h | 10 +++---
 include/wx/gtk1/tbargtk.h  |  4 +--
 include/wx/gtk1/textctrl.h | 37 +------------------
 include/wx/gtk1/tglbtn.h   |  4 +--
 include/wx/gtk1/timer.h    |  2 +-
 include/wx/gtk1/tooltip.h  |  2 +-
 include/wx/gtk1/toplevel.h |  2 +-
 include/wx/gtk1/treectrl.h |  2 +-
 include/wx/gtk1/win_gtk.h  |  4 +--
 include/wx/gtk1/window.h   | 29 +--------------
 62 files changed, 100 insertions(+), 253 deletions(-)

diff --git a/include/wx/gtk1/accel.h b/include/wx/gtk1/accel.h
index 035a0fd38c..62cf892ef3 100644
--- a/include/wx/gtk1/accel.h
+++ b/include/wx/gtk1/accel.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/accel.h
+// Name:        wx/gtk1/accel.h
 // Purpose:     wxAcceleratorTable redirection file
 // Author:      Julian Smart
 // Modified by:
diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index c5e991ba0e..27c5e7faaf 100644
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/app.h
+// Name:        wx/gtk1/app.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -54,7 +54,7 @@ public:
 
     gint            m_idleTag;
     void RemoveIdleTag();
-    
+
     unsigned char  *m_colorCube;
 
     // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
@@ -64,7 +64,7 @@ public:
     // This returns the current visual: either that used by wxRootWindow
     // or the XVisualInfo* for SGI.
     GdkVisual      *GetGdkVisual();
-    
+
 private:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__
diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 0e74b7a631..8168c9a9d8 100644
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/bitmap.h
+// Name:        wx/gtk1/bitmap.h
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -17,10 +17,6 @@
 #include "wx/palette.h"
 #include "wx/gdiobj.h"
 
-#ifdef __WXGTK20__
-typedef struct _GdkPixbuf GdkPixbuf;
-#endif
-
 class WXDLLEXPORT wxPixelDataBase;
 
 //-----------------------------------------------------------------------------
@@ -118,17 +114,10 @@ public:
     void SetDepth( int depth );
     void SetPixmap( GdkPixmap *pixmap );
     void SetBitmap( GdkBitmap *bitmap );
-#ifdef __WXGTK20__
-    void SetPixbuf(GdkPixbuf *pixbuf);
-#endif
 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;
     bool HasPixmap() const;
-#ifdef __WXGTK20__
-    bool HasPixbuf() const;
-    GdkPixbuf *GetPixbuf() const;
-#endif
 
     // Basically, this corresponds to Win32 StretchBlt()
     wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height );
@@ -149,20 +138,6 @@ private:
     bool CreateFromImageAsBitmap(const wxImage& image);
     bool CreateFromImageAsPixmap(const wxImage& image);
 
-#ifdef __WXGTK20__
-    bool CreateFromImageAsPixbuf(const wxImage& image);
-
-    enum Representation
-    {
-        Pixmap,
-        Pixbuf
-    };
-    // removes other representations from memory, keeping only 'keep'
-    // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf):
-    void PurgeOtherRepresentations(Representation keep);
-
-    friend class wxMemoryDC;
-#endif
     friend class wxBitmapHandler;
 
 private:
diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index a6a6bc1b51..0469870587 100644
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/bmpbutton.h
+// Name:        wx/gtk1/bmpbutton.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h
index 911a4783fa..ecdfe46398 100644
--- a/include/wx/gtk1/brush.h
+++ b/include/wx/gtk1/brush.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/brush.h
+// Name:        wx/gtk1/brush.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index 95c74f0da3..aa5fe7b18f 100644
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/button.h
+// Name:        wx/gtk1/button.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -67,7 +67,7 @@ public:
     // Since this wxButton doesn't derive from wxButtonBase (why?) we need
     // to override this here too...
     virtual bool ShouldInheritColours() const { return false; }
-    
+
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
diff --git a/include/wx/gtk1/checkbox.h b/include/wx/gtk1/checkbox.h
index 555a708d26..386a1bcb12 100644
--- a/include/wx/gtk1/checkbox.h
+++ b/include/wx/gtk1/checkbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/checkbox.h
+// Name:        wx/gtk1/checkbox.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -43,7 +43,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-    
+
     // implementation
     // --------------
 
@@ -59,11 +59,6 @@ public:
 protected:
     virtual wxSize DoGetBestSize() const;
 
-#ifdef __WXGTK20__
-    void DoSet3StateValue(wxCheckBoxState state);
-    wxCheckBoxState DoGet3StateValue() const;
-#endif
-
 private:
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h
index a1766e7bb6..3bd0b0f1c0 100644
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        checklst.h
+// Name:        wx/gtk1/checklst.h
 // Purpose:     wxCheckListBox class
 // Author:      Robert Roebling
 // Modified by:
@@ -52,7 +52,7 @@ public:
     void Check( int index, bool check = TRUE );
 
     int GetItemHeight() const;
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };
diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 5b0526a275..e8fc3a7f16 100644
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/choice.h
+// Name:        wx/gtk1/choice.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/clipbrd.h b/include/wx/gtk1/clipbrd.h
index e3a2371bb5..8d17cdc6f4 100644
--- a/include/wx/gtk1/clipbrd.h
+++ b/include/wx/gtk1/clipbrd.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        clipboard.h
+// Name:        wx/gtk1/clipboard.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -57,7 +57,7 @@ public:
     // primary == FALSE resets it.
     virtual void UsePrimarySelection(bool primary = TRUE)
         { m_usePrimary = primary; }
-    
+
     // implementation from now on
     bool              m_open;
     bool              m_ownsClipboard;
diff --git a/include/wx/gtk1/colordlg.h b/include/wx/gtk1/colordlg.h
index 107b3ca9ed..5c20ca2e62 100644
--- a/include/wx/gtk1/colordlg.h
+++ b/include/wx/gtk1/colordlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/colordlg.h
+// Name:        wx/gtk1/colordlg.h
 // Purpose:     wxColourDialog
 // Author:      Vaclav Slavik
 // Modified by:
@@ -44,7 +44,7 @@ protected:
     // copy data between the dialog and m_colourData:
     void ColourDataToDialog();
     void DialogToColourData();
-    
+
     wxColourData m_data;
 
     DECLARE_DYNAMIC_CLASS(wxColourDialog)
diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index e168cb3810..dab437e7b3 100644
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/colour.h
+// Name:        wx/gtk1/colour.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 4f551834ed..d4e6df33cd 100644
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/combobox.h
+// Name:        wx/gtk1/combobox.h
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index 42e48726bf..a579a27492 100644
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        control.h
+// Name:        wx/gtk1/control.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h
index a9964a07f8..67eabdb5de 100644
--- a/include/wx/gtk1/cursor.h
+++ b/include/wx/gtk1/cursor.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cursor.h
+// Name:        wx/gtk1/cursor.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/dataform.h b/include/wx/gtk1/dataform.h
index 3b66e3117a..5cb61dce26 100644
--- a/include/wx/gtk1/dataform.h
+++ b/include/wx/gtk1/dataform.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/dataform.h
+// Name:        wx/gtk1/dataform.h
 // Purpose:     declaration of the wxDataFormat class
 // Author:      Vadim Zeitlin
 // Modified by:
diff --git a/include/wx/gtk1/dataobj.h b/include/wx/gtk1/dataobj.h
index 2623777643..0f77108473 100644
--- a/include/wx/gtk1/dataobj.h
+++ b/include/wx/gtk1/dataobj.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/dataobj.h
+// Name:        wx/gtk1/dataobj.h
 // Purpose:     declaration of the wxDataObject
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
diff --git a/include/wx/gtk1/dataobj2.h b/include/wx/gtk1/dataobj2.h
index f612ffaf7d..9672274e2f 100644
--- a/include/wx/gtk1/dataobj2.h
+++ b/include/wx/gtk1/dataobj2.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/dataobj2.h
+// Name:        wx/gtk1/dataobj2.h
 // Purpose:     declaration of standard wxDataObjectSimple-derived classes
 // Author:      Robert Roebling
 // Created:     19.10.99 (extracted from gtk/dataobj.h)
diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h
index daf2bdc1ec..f7023538ab 100644
--- a/include/wx/gtk1/dc.h
+++ b/include/wx/gtk1/dc.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/dc.h
+// Name:        wx/gtk1/dc.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index 4cc62a0e4c..94cdb1d83d 100644
--- a/include/wx/gtk1/dcclient.h
+++ b/include/wx/gtk1/dcclient.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcclient.h
+// Name:        wx/gtk1/dcclient.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -115,13 +115,6 @@ public:
     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;
 
-    // PangoContext stuff for GTK 2.0
-#ifdef __WXGTK20__
-    PangoContext *m_context;
-    PangoLayout *m_layout;
-    PangoFontDescription *m_fontdesc;
-#endif
-
     void SetUpDC();
     void Destroy();
     virtual void ComputeScaleAndOrigin();
diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h
index 93bfb09883..d4f5f4875f 100644
--- a/include/wx/gtk1/dcmemory.h
+++ b/include/wx/gtk1/dcmemory.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.h
+// Name:        wx/gtk1/dcmemory.h
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
diff --git a/include/wx/gtk1/dcscreen.h b/include/wx/gtk1/dcscreen.h
index 3b23ae3204..07a976c721 100644
--- a/include/wx/gtk1/dcscreen.h
+++ b/include/wx/gtk1/dcscreen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcscreen.h
+// Name:        wx/gtk1/dcscreen.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 46e0074dfd..6aac74cb96 100644
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.h
+// Name:        wx/gtk1/dialog.h
 // Purpose:
 // Author:      Robert Roebling
 // Created:
diff --git a/include/wx/gtk1/dnd.h b/include/wx/gtk1/dnd.h
index 13a381f50e..988ef117f1 100644
--- a/include/wx/gtk1/dnd.h
+++ b/include/wx/gtk1/dnd.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        dnd.h
+// Name:        wx/gtk1/dnd.h
 // Purpose:     declaration of the wxDropTarget class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
diff --git a/include/wx/gtk1/filedlg.h b/include/wx/gtk1/filedlg.h
index 44a07faa5a..e4859f6e08 100644
--- a/include/wx/gtk1/filedlg.h
+++ b/include/wx/gtk1/filedlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        filedlg.h
+// Name:        wx/gtk1/filedlg.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/font.h b/include/wx/gtk1/font.h
index 2d12659dc4..3f7611781f 100644
--- a/include/wx/gtk1/font.h
+++ b/include/wx/gtk1/font.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        font.h
+// Name:        wx/gtk1/font.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -97,9 +97,7 @@ public:
     // implementation from now on
     void Unshare();
 
-#ifndef __WXGTK20__
     GdkFont* GetInternalFont(float scale = 1.0) const;
-#endif
 
     // no data :-)
 
diff --git a/include/wx/gtk1/fontdlg.h b/include/wx/gtk1/fontdlg.h
index 9f3e37f2ec..3a9366edce 100644
--- a/include/wx/gtk1/fontdlg.h
+++ b/include/wx/gtk1/fontdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fontdlgg.h
+// Name:        wx/gtk1/fontdlgg.h
 // Purpose:     wxFontDialog
 // Author:      Robert Roebling
 // Created:
diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 94949f2d67..49d68c8805 100644
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/frame.h
+// Name:        wx/gtk1/frame.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -60,7 +60,7 @@ public:
                                          long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE,
                                          wxWindowID id = 0,
                                          const wxString& name = wxStatusLineNameStr);
-                                         
+
     void SetStatusBar(wxStatusBar *statbar);
 #endif // wxUSE_STATUSBAR
 
@@ -70,7 +70,7 @@ public:
                                      const wxString& name = wxToolBarNameStr);
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
-    
+
     wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }
 
     // implementation from now on
diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index 6b967c3bc8..0f41210a76 100644
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gauge.h
+// Name:        wx/gtk1/gauge.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -71,10 +71,10 @@ public:
     int GetValue() const;
 
     bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
-    
+
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-    
+
     // implementation
     // -------------
 
diff --git a/include/wx/gtk1/gdiobj.h b/include/wx/gtk1/gdiobj.h
index ffc2b72c20..4a35500f3f 100644
--- a/include/wx/gtk1/gdiobj.h
+++ b/include/wx/gtk1/gdiobj.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gdiobj.h
+// Name:        wx/gtk1/gdiobj.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index 9619864f94..1dd103cfc1 100644
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        glcanvas.h
+// Name:        wx/gtk1/glcanvas.h
 // Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
 // Author:      Robert Roebling
 // Modified by:
diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index 00e65f06e6..38019ae2ef 100644
--- a/include/wx/gtk1/icon.h
+++ b/include/wx/gtk1/icon.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        icon.h
+// Name:        wx/gtk1/icon.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h
index be7a4e444d..4b74c4e7b6 100644
--- a/include/wx/gtk1/listbox.h
+++ b/include/wx/gtk1/listbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/listbox.h
+// Name:        wx/gtk1/listbox.h
 // Purpose:     wxListBox class declaration
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 38f7b63d6c..eee60c7029 100644
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/mdi.h
+// Name:        wx/gtk1/mdi.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index 9a2d3a80f9..afc6828886 100644
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/menu.h
+// Name:        wx/gtk1/menu.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -44,9 +44,7 @@ public:
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
 
-#ifndef __WXGTK20__
     GtkAccelGroup   *m_accel;
-#endif
     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;
diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index e732318285..19a3a045a5 100644
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        menuitem.h
+// Name:        wx/gtk1/menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
diff --git a/include/wx/gtk1/minifram.h b/include/wx/gtk1/minifram.h
index c8f07a0836..3d1bcee396 100644
--- a/include/wx/gtk1/minifram.h
+++ b/include/wx/gtk1/minifram.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        minifram.h
+// Name:        wx/gtk1/minifram.h
 // Purpose:     wxMiniFrame class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -54,7 +54,7 @@ public:
 
     virtual void SetTitle( const wxString &title );
  // implementation
- 
+
     bool   m_isDragging;
     int    m_oldX,m_oldY;
     int    m_diffX,m_diffY;
diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index 2921c3583c..27eccbbe23 100644
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        notebook.h
+// Name:        wx/gtk1/notebook.h
 // Purpose:     wxNotebook class
 // Author:      Robert Roebling
 // Modified by:
diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index 2c6b707d73..aef9877563 100644
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/pen.h
+// Name:        wx/gtk1/pen.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -22,7 +22,7 @@
 
 class WXDLLIMPEXP_CORE wxPen;
 
-#if defined(__WXGTK127__) || defined(__WXGTK20__)
+#if defined(__WXGTK127__)
 typedef    gint8 wxGTKDash;
 #else
 typedef    gchar wxGTKDash;
diff --git a/include/wx/gtk1/popupwin.h b/include/wx/gtk1/popupwin.h
index aa4f657982..fad5e8239f 100644
--- a/include/wx/gtk1/popupwin.h
+++ b/include/wx/gtk1/popupwin.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        popupwin.h
+// Name:        wx/gtk1/popupwin.h
 // Purpose:
 // Author:      Robert Roebling
 // Created:
diff --git a/include/wx/gtk1/private.h b/include/wx/gtk1/private.h
index 3fe0527aaa..753c7508f2 100644
--- a/include/wx/gtk1/private.h
+++ b/include/wx/gtk1/private.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/private.h
+// Name:        wx/gtk1/private.h
 // Purpose:     wxGTK private macros, functions &c
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -23,43 +23,15 @@
     #define GTK_CHECK_VERSION(a, b, c) 0
 #endif
 
-#ifdef __WXGTK20__
-#if wxUSE_UNICODE
-    #define wxGTK_CONV(s) wxConvUTF8.cWX2MB(s)
-    #define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX(s)
-#else
-    #define wxGTK_CONV(s) wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC(s) )
-    #define wxGTK_CONV_BACK(s)  wxConvLocal.cWC2WX( (wxConvUTF8.cMB2WC( s ) ) )
-#endif
-#else
-    #define wxGTK_CONV(s) s.c_str()
-    #define wxGTK_CONV_BACK(s) s
-#endif
+#define wxGTK_CONV(s) s.c_str()
+#define wxGTK_CONV_BACK(s) s
 
 
-// GTK+ 2.0 compatibility define is broken when used from C++ as it
-// casts enum to int implicitly
-#ifdef __WXGTK20__
-    #undef gtk_signal_disconnect_by_func
-    #define gtk_signal_disconnect_by_func(object,func,data) \
-        gtk_signal_compat_matched((object), (func), (data), \
-                                  (GSignalMatchType)(G_SIGNAL_MATCH_FUNC | \
-                                                     G_SIGNAL_MATCH_DATA), 0)
-#endif
-
 // child is not a member of GTK_BUTTON() any more in GTK+ 2.0
-#ifdef __WXGTK20__
-    #define BUTTON_CHILD(w) GTK_BIN((w))->child
-#else
-    #define BUTTON_CHILD(w) GTK_BUTTON((w))->child
-#endif
+#define BUTTON_CHILD(w) GTK_BUTTON((w))->child
 
 // event_window has disappeared from GtkToggleButton in GTK+ 2.0
-#ifdef __WXGTK20__
-    #define TOGGLE_BUTTON_EVENT_WIN(w) GTK_BUTTON((w))->event_window
-#else
-    #define TOGGLE_BUTTON_EVENT_WIN(w) GTK_TOGGLE_BUTTON((w))->event_window
-#endif
+#define TOGGLE_BUTTON_EVENT_WIN(w) GTK_TOGGLE_BUTTON((w))->event_window
 
 // gtk_editable_{copy|cut|paste}_clipboard() had an extra argument under
 // previous GTK+ versions but no more
@@ -69,31 +41,16 @@
     #define DUMMY_CLIPBOARD_ARG  ,0
 #endif
 
-// _GtkEditable is now private
-#ifdef __WXGTK20__
-    #define GET_EDITABLE_POS(w) gtk_editable_get_position(GTK_EDITABLE(w))
-    #define SET_EDITABLE_POS(w, pos) \
-        gtk_editable_set_position(GTK_EDITABLE(w), (pos))
-#else
-    #define GET_EDITABLE_POS(w) GTK_EDITABLE((w))->current_pos
-    #define SET_EDITABLE_POS(w, pos) \
-        GTK_EDITABLE((w))->current_pos = (pos)
-#endif
+// _GtkEditable is private in GTK2
+#define GET_EDITABLE_POS(w) GTK_EDITABLE((w))->current_pos
+#define SET_EDITABLE_POS(w, pos) \
+    GTK_EDITABLE((w))->current_pos = (pos)
 
-// this GtkNotebook struct field has been renamed
-#ifdef __WXGTK20__
-    #define NOTEBOOK_PANEL(nb)  GTK_NOTEBOOK(nb)->event_window
-#else
-    #define NOTEBOOK_PANEL(nb)  GTK_NOTEBOOK(nb)->panel
-#endif
+// this GtkNotebook struct field has been renamed in GTK2
+#define NOTEBOOK_PANEL(nb)  GTK_NOTEBOOK(nb)->panel
 
-#ifdef __WXGTK20__
-    #define SCROLLBAR_CBACK_ARG
-    #define GET_SCROLL_TYPE(w)   GTK_SCROLL_JUMP
-#else
-    #define SCROLLBAR_CBACK_ARG
-    #define GET_SCROLL_TYPE(w)   GTK_RANGE((w))->scroll_type
-#endif
+#define SCROLLBAR_CBACK_ARG
+#define GET_SCROLL_TYPE(w)   GTK_RANGE((w))->scroll_type
 
 // translate a GTK+ scroll type to a wxEventType
 inline wxEventType GtkScrollTypeToWx(guint scrollType)
@@ -135,11 +92,6 @@ inline wxEventType GtkScrollWinTypeToWx(guint scrollType)
 void wxAddGrab(wxWindow* window);
 void wxRemoveGrab(wxWindow* window);
 
-#ifdef __WXGTK20__
-// Escapes string so that it is valid Pango markup XML string:
-WXDLLIMPEXP_CORE wxString wxEscapeStringForPangoMarkup(const wxString& str);
-#endif
-
 // The declaration for gtk_icon_size_lookup was accidentally ifdefed out in
 // GTK+ 2.1.0 which Sun seem to have shipped with some versions of JDS
 // for Solaris 9 x86.
diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h
index f4a0bb123c..4e45065d22 100644
--- a/include/wx/gtk1/radiobox.h
+++ b/include/wx/gtk1/radiobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/radiobox.h
+// Name:        wx/gtk1/radiobox.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/radiobut.h b/include/wx/gtk1/radiobut.h
index 9a54dffa62..28cc834385 100644
--- a/include/wx/gtk1/radiobut.h
+++ b/include/wx/gtk1/radiobut.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/radiobut.h
+// Name:        wx/gtk1/radiobut.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h
index f9925be044..5319f14975 100644
--- a/include/wx/gtk1/region.h
+++ b/include/wx/gtk1/region.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/region.h
+// Name:        wx/gtk1/region.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h
index fd3b78ace3..9ddd84763e 100644
--- a/include/wx/gtk1/scrolbar.h
+++ b/include/wx/gtk1/scrolbar.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        scrolbar.h
+// Name:        wx/gtk1/scrolbar.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -65,7 +65,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-    
+
     // implementation
     // --------------
 
diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h
index 92ecc160d7..4142805d1a 100644
--- a/include/wx/gtk1/scrolwin.h
+++ b/include/wx/gtk1/scrolwin.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/scrolwin.h
+// Name:        wx/gtk1/scrolwin.h
 // Purpose:     wxScrolledWindow class
 // Author:      Robert Roebling
 // Modified by: Vadim Zeitlin (2005-10-10): wxScrolledWindow is now common
diff --git a/include/wx/gtk1/slider.h b/include/wx/gtk1/slider.h
index 2b048f9979..1132e88eb5 100644
--- a/include/wx/gtk1/slider.h
+++ b/include/wx/gtk1/slider.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/slider.h
+// Name:        wx/gtk1/slider.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -58,7 +58,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-    
+
     // implementation
     bool IsOwnGtkWindow( GdkWindow *window );
     void GtkDisableEvents();
diff --git a/include/wx/gtk1/spinbutt.h b/include/wx/gtk1/spinbutt.h
index 7444e0732a..c9b6f385e1 100644
--- a/include/wx/gtk1/spinbutt.h
+++ b/include/wx/gtk1/spinbutt.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/spinbutt.h
+// Name:        wx/gtk1/spinbutt.h
 // Purpose:     wxSpinButton class
 // Author:      Robert Roebling
 // Modified by:
@@ -44,7 +44,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-    
+
     // implementation
     void OnSize( wxSizeEvent &event );
 
diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h
index 50a65db8fc..3237b1eeee 100644
--- a/include/wx/gtk1/spinctrl.h
+++ b/include/wx/gtk1/spinctrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        spinctrl.h
+// Name:        wx/gtk1/spinctrl.h
 // Purpose:     wxSpinCtrl class
 // Author:      Robert Roebling
 // Modified by:
@@ -57,10 +57,10 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-    
+
     // implementation
     void OnChar( wxKeyEvent &event );
-    
+
     bool IsOwnGtkWindow( GdkWindow *window );
     void GtkDisableEvents();
     void GtkEnableEvents();
diff --git a/include/wx/gtk1/statbmp.h b/include/wx/gtk1/statbmp.h
index d1194eb193..0e72430522 100644
--- a/include/wx/gtk1/statbmp.h
+++ b/include/wx/gtk1/statbmp.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/statbmp.h
+// Name:        wx/gtk1/statbmp.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -49,7 +49,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-    
+
 private:
     wxBitmap   m_bitmap;
 
diff --git a/include/wx/gtk1/statbox.h b/include/wx/gtk1/statbox.h
index 67e0a8e21d..400f56377e 100644
--- a/include/wx/gtk1/statbox.h
+++ b/include/wx/gtk1/statbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/stabox.h
+// Name:        wx/gtk1/stabox.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -44,7 +44,7 @@ public:
 
 protected:
     void DoApplyWidgetStyle(GtkRcStyle *style);
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBox)
 };
diff --git a/include/wx/gtk1/statline.h b/include/wx/gtk1/statline.h
index cbf7870042..a0d212b692 100644
--- a/include/wx/gtk1/statline.h
+++ b/include/wx/gtk1/statline.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/statline.h
+// Name:        wx/gtk1/statline.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h
index c17c410591..4c4c110507 100644
--- a/include/wx/gtk1/stattext.h
+++ b/include/wx/gtk1/stattext.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.h
+// Name:        wx/gtk1/stattext.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -37,7 +37,7 @@ public:
                  wxWindowID id,
                  const wxString &label,
                  const wxPoint &pos = wxDefaultPosition,
-                 const wxSize &size = wxDefaultSize, 
+                 const wxSize &size = wxDefaultSize,
                  long style = 0,
                  const wxString &name = wxStaticTextNameStr );
 
@@ -45,7 +45,7 @@ public:
                 wxWindowID id,
                 const wxString &label,
                 const wxPoint &pos = wxDefaultPosition,
-                const wxSize &size = wxDefaultSize, 
+                const wxSize &size = wxDefaultSize,
                 long style = 0,
                 const wxString &name = wxStaticTextNameStr );
 
@@ -57,7 +57,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-    
+
     // see wx/stattext.h
     void Wrap(int width);
 
@@ -68,7 +68,7 @@ protected:
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
-                           
+
     virtual wxSize DoGetBestSize() const;
 
     DECLARE_DYNAMIC_CLASS(wxStaticText)
diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h
index 0b688d0ffa..5891f42aa5 100644
--- a/include/wx/gtk1/tbargtk.h
+++ b/include/wx/gtk1/tbargtk.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tbargtk.h
+// Name:        wx/gtk1/tbargtk.h
 // Purpose:     GTK toolbar
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -54,7 +54,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-    
+
     // implementation from now on
     // --------------------------
 
diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index 7e54c5f218..29158f1e42 100644
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/textctrl.h
+// Name:        wx/gtk1/textctrl.h
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
@@ -86,16 +86,6 @@ public:
 
     virtual void ShowPosition(long pos);
 
-#ifdef __WXGTK20__
-    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const;
-    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
-                                            wxTextCoord *col,
-                                            wxTextCoord *row) const
-    {
-        return wxTextCtrlBase::HitTest(pt, col, row);
-    }
-#endif // __WXGTK20__
-
     // Clipboard operations
     virtual void Copy();
     virtual void Cut();
@@ -145,12 +135,8 @@ public:
     void CalculateScrollbar();
     void OnInternalIdle();
 
-#ifdef __WXGTK20__
-    void SetUpdateFont(bool WXUNUSED(update)) { }
-#else // !__WXGTK20__
     void SetUpdateFont(bool update) { m_updateFont = update; }
     void UpdateFontIfNeeded();
-#endif // __WXGTK20__/!__WXGTK20__
 
     void SetModified() { m_modified = true; }
 
@@ -196,11 +182,6 @@ protected:
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
-#ifdef __WXGTK20__
-    // has the control been frozen by Freeze()?
-    bool IsFrozen() const { return m_frozenness > 0; }
-#endif
-
 private:
     // change the font for everything in this control
     void ChangeFontGlobally();
@@ -210,25 +191,9 @@ private:
 
     bool        m_modified:1;
     bool        m_vScrollbarVisible:1;
-#ifndef __WXGTK20__
     bool        m_updateFont:1;
-#endif // !__WXGTK20__
     bool        m_ignoreNextUpdate:1;
 
-#ifdef __WXGTK20__
-    // Our text buffer. Convenient, and holds the buffer while using
-    // a dummy one when m_frozenness > 0
-    GtkTextBuffer *m_buffer;
-
-    // number of calls to Freeze() minus number of calls to Thaw()
-    unsigned int m_frozenness;
-
-    // For wxTE_AUTO_URL
-    void OnUrlMouseEvent(wxMouseEvent&);
-    GdkCursor *m_gdkHandCursor;
-    GdkCursor *m_gdkXTermCursor;
-#endif
-
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 };
diff --git a/include/wx/gtk1/tglbtn.h b/include/wx/gtk1/tglbtn.h
index 50d981942a..b4c143d457 100644
--- a/include/wx/gtk1/tglbtn.h
+++ b/include/wx/gtk1/tglbtn.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/tglbtn.h
+// Name:        wx/gtk1/tglbtn.h
 // Purpose:     Declaration of the wxToggleButton class, which implements a
 //              toggle button under wxGTK.
 // Author:      John Norris, minor changes by Axel Schlueter
@@ -125,7 +125,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
- 
+
     // implementation
     bool m_blockEvent;
 
diff --git a/include/wx/gtk1/timer.h b/include/wx/gtk1/timer.h
index f35a07a7f8..ec715f932c 100644
--- a/include/wx/gtk1/timer.h
+++ b/include/wx/gtk1/timer.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/timer.h
+// Name:        wx/gtk1/timer.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/tooltip.h b/include/wx/gtk1/tooltip.h
index f79618899a..d5666edefb 100644
--- a/include/wx/gtk1/tooltip.h
+++ b/include/wx/gtk1/tooltip.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tooltip.h
+// Name:        wx/gtk1/tooltip.h
 // Purpose:     wxToolTip class
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h
index 2729119b50..beeb8635f7 100644
--- a/include/wx/gtk1/toplevel.h
+++ b/include/wx/gtk1/toplevel.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/toplevel.h
+// Name:        wx/gtk1/toplevel.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
diff --git a/include/wx/gtk1/treectrl.h b/include/wx/gtk1/treectrl.h
index 280b08ea3a..3e177c70cb 100644
--- a/include/wx/gtk1/treectrl.h
+++ b/include/wx/gtk1/treectrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        treectrl.h
+// Name:        wx/gtk1/treectrl.h
 // Purpose:     wxTreeCtrl class
 // Author:      Denis Pershin
 // Modified by:
diff --git a/include/wx/gtk1/win_gtk.h b/include/wx/gtk1/win_gtk.h
index 1ade9a1ae6..78cbe0b531 100644
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -1,5 +1,5 @@
 /* ///////////////////////////////////////////////////////////////////////////
-// Name:        win_gtk.h
+// Name:        wx/gtk1/win_gtk.h
 // Purpose:     wxWidgets's GTK base widget = GtkPizza
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -19,9 +19,7 @@ extern "C" {
 #include <gdk/gdkx.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkadjustment.h>
-#ifndef __WXGTK20__
 #include <gtk/gtkfeatures.h>
-#endif
 
 #include "wx/dlimpexp.h"
 
diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index e3ea31dc2f..4ed4c68ea0 100644
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/window.h
+// Name:        wx/gtk1/window.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -108,11 +108,6 @@ public:
     virtual void SetDropTarget( wxDropTarget *dropTarget );
 #endif // wxUSE_DRAG_AND_DROP
 
-#ifdef __WXGTK20__
-    virtual void AddChild( wxWindowBase *child );
-    virtual void RemoveChild( wxWindowBase *child );
-#endif
-
     // implementation
     // --------------
 
@@ -160,11 +155,6 @@ public:
     virtual bool IsOwnGtkWindow( GdkWindow *window );
     void ConnectWidget( GtkWidget *widget );
 
-#ifdef __WXGTK20__
-    // Returns the default context which usually is anti-aliased
-    PangoContext   *GtkGetPangoDefaultContext();
-#endif
-
 #if wxUSE_TOOLTIPS
     virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
 #endif // wxUSE_TOOLTIPS
@@ -201,21 +191,15 @@ public:
     // this widget will be queried for GTK's focus events
     GtkWidget           *m_focusWidget;
 
-#ifdef __WXGTK20__
-    wxGtkIMData         *m_imData;
-#else // GTK 1
 #ifdef HAVE_XIM
     // XIM support for wxWidgets
     GdkIC               *m_ic;
     GdkICAttr           *m_icattr;
 #endif // HAVE_XIM
-#endif // GTK 2/1
 
-#ifndef __WXGTK20__
     // The area to be cleared (and not just refreshed)
     // We cannot make this distinction under GTK 2.0.
     wxRegion             m_clearRegion;
-#endif
 
     // scrolling stuff
     GtkAdjustment       *m_hAdjust,*m_vAdjust;
@@ -234,10 +218,6 @@ public:
     bool                 m_hasFocus:1;          // true if == FindFocus()
     bool                 m_isScrolling:1;       // dragging scrollbar thumb?
     bool                 m_clipPaintRegion:1;   // true after ScrollWindow()
-#ifdef __WXGTK20__
-    bool                 m_dirtyTabOrder:1;     // tab order changed, GTK focus
-                                                // chain needs update
-#endif
     bool                 m_needsStyleChange:1;  // May not be able to change
                                                 // background style until OnIdle
 
@@ -269,13 +249,6 @@ protected:
     // common part of all ctors (not virtual because called from ctor)
     void Init();
 
-#ifdef __WXGTK20__
-    virtual void DoMoveInTabOrder(wxWindow *win, MoveKind move);
-
-    // Copies m_children tab order to GTK focus chain:
-    void RealizeTabOrder();
-#endif
-
     // Called by ApplyWidgetStyle (which is called by SetFont() and
     // SetXXXColour etc to apply style changed to native widgets) to create
     // modified GTK style with non-standard attributes. If forceStyle=true,
-- 
2.45.2