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

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/accel.h
+// Name:        wx/gtk1/accel.h
 // Purpose:     wxAcceleratorTable redirection file
 // Author:      Julian Smart
 // Modified by:

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$

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:

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$

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$

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$

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$
@@ -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)
 };

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:

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$

include/wx/gtk1/clipbrd.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        clipboard.h
+// Name:        wx/gtk1/clipboard.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

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:

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$

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

include/wx/gtk1/control.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        control.h
+// Name:        wx/gtk1/control.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

include/wx/gtk1/cursor.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cursor.h
+// Name:        wx/gtk1/cursor.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

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:

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$

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)

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$

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();

include/wx/gtk1/dcmemory.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.h
+// Name:        wx/gtk1/dcmemory.h
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$

include/wx/gtk1/dcscreen.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcscreen.h
+// Name:        wx/gtk1/dcscreen.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

include/wx/gtk1/dialog.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.h
+// Name:        wx/gtk1/dialog.h
 // Purpose:
 // Author:      Robert Roebling
 // Created:

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$

include/wx/gtk1/filedlg.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        filedlg.h
+// Name:        wx/gtk1/filedlg.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

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 :-)
 

include/wx/gtk1/fontdlg.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fontdlgg.h
+// Name:        wx/gtk1/fontdlgg.h
 // Purpose:     wxFontDialog
 // Author:      Robert Roebling
 // Created:

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$

include/wx/gtk1/gauge.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gauge.h
+// Name:        wx/gtk1/gauge.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

include/wx/gtk1/gdiobj.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gdiobj.h
+// Name:        wx/gtk1/gdiobj.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

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:

include/wx/gtk1/icon.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        icon.h
+// Name:        wx/gtk1/icon.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

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$

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$

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;

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$

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$

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:

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;

include/wx/gtk1/popupwin.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        popupwin.h
+// Name:        wx/gtk1/popupwin.h
 // Purpose:
 // Author:      Robert Roebling
 // Created:

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__
+#define wxGTK_CONV(s) s.c_str()
-#if wxUSE_UNICODE
+#define wxGTK_CONV_BACK(s) s
-    #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
 
 
-// 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_BUTTON((w))->child
-    #define BUTTON_CHILD(w) GTK_BIN((w))->child
-#else
-    #define BUTTON_CHILD(w) GTK_BUTTON((w))->child
-#endif
 
 // event_window has disappeared from GtkToggleButton in GTK+ 2.0
-#ifdef __WXGTK20__
+#define TOGGLE_BUTTON_EVENT_WIN(w) GTK_TOGGLE_BUTTON((w))->event_window
-    #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
 
 // 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
+// _GtkEditable is private in GTK2
-#ifdef __WXGTK20__
+#define GET_EDITABLE_POS(w) GTK_EDITABLE((w))->current_pos
-    #define GET_EDITABLE_POS(w) gtk_editable_get_position(GTK_EDITABLE(w))
+#define SET_EDITABLE_POS(w, pos) \
-    #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
 
-// this GtkNotebook struct field has been renamed
+// this GtkNotebook struct field has been renamed in GTK2
-#ifdef __WXGTK20__
+#define NOTEBOOK_PANEL(nb)  GTK_NOTEBOOK(nb)->panel
-    #define NOTEBOOK_PANEL(nb)  GTK_NOTEBOOK(nb)->event_window
-#else
-    #define NOTEBOOK_PANEL(nb)  GTK_NOTEBOOK(nb)->panel
-#endif
 
-#ifdef __WXGTK20__
+#define SCROLLBAR_CBACK_ARG
-    #define SCROLLBAR_CBACK_ARG
+#define GET_SCROLL_TYPE(w)   GTK_RANGE((w))->scroll_type
-    #define GET_SCROLL_TYPE(w)   GTK_SCROLL_JUMP
-#else
-    #define SCROLLBAR_CBACK_ARG
-    #define GET_SCROLL_TYPE(w)   GTK_RANGE((w))->scroll_type
-#endif
 
 // 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.

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$

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$

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$

include/wx/gtk1/scrolbar.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        scrolbar.h
+// Name:        wx/gtk1/scrolbar.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

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

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$

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:

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:

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$

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$

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$

include/wx/gtk1/stattext.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.h
+// Name:        wx/gtk1/stattext.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

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$

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)
 };

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

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$

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$

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$

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:

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"
 

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,