/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/accel.h
+// Name: wx/gtk1/accel.h
// Purpose: wxAcceleratorTable redirection file
// Author: Julian Smart
// Modified by:
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/app.h
+// Name: wx/gtk1/app.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
gint m_idleTag;
void RemoveIdleTag();
-
+
unsigned char *m_colorCube;
// Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
// 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__
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/bitmap.h
+// Name: wx/gtk1/bitmap.h
// Purpose:
// Author: Robert Roebling
// RCS-ID: $Id$
#include "wx/palette.h"
#include "wx/gdiobj.h"
-#ifdef __WXGTK20__
-typedef struct _GdkPixbuf GdkPixbuf;
-#endif
-
class WXDLLEXPORT wxPixelDataBase;
//-----------------------------------------------------------------------------
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 );
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:
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/bmpbutton.h
+// Name: wx/gtk1/bmpbutton.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/brush.h
+// Name: wx/gtk1/brush.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/button.h
+// Name: wx/gtk1/button.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// 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);
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/checkbox.h
+// Name: wx/gtk1/checkbox.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
+
// implementation
// --------------
protected:
virtual wxSize DoGetBestSize() const;
-#ifdef __WXGTK20__
- void DoSet3StateValue(wxCheckBoxState state);
- wxCheckBoxState DoGet3StateValue() const;
-#endif
-
private:
DECLARE_DYNAMIC_CLASS(wxCheckBox)
};
///////////////////////////////////////////////////////////////////////////////
-// Name: checklst.h
+// Name: wx/gtk1/checklst.h
// Purpose: wxCheckListBox class
// Author: Robert Roebling
// Modified by:
void Check( int index, bool check = TRUE );
int GetItemHeight() const;
-
+
private:
DECLARE_DYNAMIC_CLASS(wxCheckListBox)
};
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/choice.h
+// Name: wx/gtk1/choice.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: clipboard.h
+// Name: wx/gtk1/clipboard.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// primary == FALSE resets it.
virtual void UsePrimarySelection(bool primary = TRUE)
{ m_usePrimary = primary; }
-
+
// implementation from now on
bool m_open;
bool m_ownsClipboard;
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/colordlg.h
+// Name: wx/gtk1/colordlg.h
// Purpose: wxColourDialog
// Author: Vaclav Slavik
// Modified by:
// copy data between the dialog and m_colourData:
void ColourDataToDialog();
void DialogToColourData();
-
+
wxColourData m_data;
DECLARE_DYNAMIC_CLASS(wxColourDialog)
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/colour.h
+// Name: wx/gtk1/colour.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/combobox.h
+// Name: wx/gtk1/combobox.h
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
/////////////////////////////////////////////////////////////////////////////
-// Name: control.h
+// Name: wx/gtk1/control.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: cursor.h
+// Name: wx/gtk1/cursor.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
///////////////////////////////////////////////////////////////////////////////
-// Name: gtk/dataform.h
+// Name: wx/gtk1/dataform.h
// Purpose: declaration of the wxDataFormat class
// Author: Vadim Zeitlin
// Modified by:
///////////////////////////////////////////////////////////////////////////////
-// Name: gtk/dataobj.h
+// Name: wx/gtk1/dataobj.h
// Purpose: declaration of the wxDataObject
// Author: Robert Roebling
// RCS-ID: $Id$
///////////////////////////////////////////////////////////////////////////////
-// 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)
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/dc.h
+// Name: wx/gtk1/dc.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: dcclient.h
+// Name: wx/gtk1/dcclient.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
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();
/////////////////////////////////////////////////////////////////////////////
-// Name: dcmemory.h
+// Name: wx/gtk1/dcmemory.h
// Purpose:
// Author: Robert Roebling
// RCS-ID: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: dcscreen.h
+// Name: wx/gtk1/dcscreen.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: dialog.h
+// Name: wx/gtk1/dialog.h
// Purpose:
// Author: Robert Roebling
// Created:
///////////////////////////////////////////////////////////////////////////////
-// Name: dnd.h
+// Name: wx/gtk1/dnd.h
// Purpose: declaration of the wxDropTarget class
// Author: Robert Roebling
// RCS-ID: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: filedlg.h
+// Name: wx/gtk1/filedlg.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: font.h
+// Name: wx/gtk1/font.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// implementation from now on
void Unshare();
-#ifndef __WXGTK20__
GdkFont* GetInternalFont(float scale = 1.0) const;
-#endif
// no data :-)
/////////////////////////////////////////////////////////////////////////////
-// Name: fontdlgg.h
+// Name: wx/gtk1/fontdlgg.h
// Purpose: wxFontDialog
// Author: Robert Roebling
// Created:
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/frame.h
+// Name: wx/gtk1/frame.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE,
wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr);
-
+
void SetStatusBar(wxStatusBar *statbar);
#endif // wxUSE_STATUSBAR
const wxString& name = wxToolBarNameStr);
void SetToolBar(wxToolBar *toolbar);
#endif // wxUSE_TOOLBAR
-
+
wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }
// implementation from now on
/////////////////////////////////////////////////////////////////////////////
-// Name: gauge.h
+// Name: wx/gtk1/gauge.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
int GetValue() const;
bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
-
+
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
+
// implementation
// -------------
/////////////////////////////////////////////////////////////////////////////
-// Name: gdiobj.h
+// Name: wx/gtk1/gdiobj.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: glcanvas.h
+// Name: wx/gtk1/glcanvas.h
// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
// Author: Robert Roebling
// Modified by:
/////////////////////////////////////////////////////////////////////////////
-// Name: icon.h
+// Name: wx/gtk1/icon.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/listbox.h
+// Name: wx/gtk1/listbox.h
// Purpose: wxListBox class declaration
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/mdi.h
+// Name: wx/gtk1/mdi.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/menu.h
+// Name: wx/gtk1/menu.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// 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;
///////////////////////////////////////////////////////////////////////////////
-// Name: menuitem.h
+// Name: wx/gtk1/menuitem.h
// Purpose: wxMenuItem class
// Author: Robert Roebling
// RCS-ID: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: minifram.h
+// Name: wx/gtk1/minifram.h
// Purpose: wxMiniFrame class
// Author: Robert Roebling
// RCS-ID: $Id$
virtual void SetTitle( const wxString &title );
// implementation
-
+
bool m_isDragging;
int m_oldX,m_oldY;
int m_diffX,m_diffY;
/////////////////////////////////////////////////////////////////////////////
-// Name: notebook.h
+// Name: wx/gtk1/notebook.h
// Purpose: wxNotebook class
// Author: Robert Roebling
// Modified by:
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/pen.h
+// Name: wx/gtk1/pen.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
class WXDLLIMPEXP_CORE wxPen;
-#if defined(__WXGTK127__) || defined(__WXGTK20__)
+#if defined(__WXGTK127__)
typedef gint8 wxGTKDash;
#else
typedef gchar wxGTKDash;
/////////////////////////////////////////////////////////////////////////////
-// Name: popupwin.h
+// Name: wx/gtk1/popupwin.h
// Purpose:
// Author: Robert Roebling
// Created:
///////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/private.h
+// Name: wx/gtk1/private.h
// Purpose: wxGTK private macros, functions &c
// Author: Vadim Zeitlin
// Modified by:
#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
#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)
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.
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/radiobox.h
+// Name: wx/gtk1/radiobox.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/radiobut.h
+// Name: wx/gtk1/radiobut.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/region.h
+// Name: wx/gtk1/region.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: scrolbar.h
+// Name: wx/gtk1/scrolbar.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
+
// implementation
// --------------
/////////////////////////////////////////////////////////////////////////////
-// 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
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/slider.h
+// Name: wx/gtk1/slider.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
+
// implementation
bool IsOwnGtkWindow( GdkWindow *window );
void GtkDisableEvents();
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/spinbutt.h
+// Name: wx/gtk1/spinbutt.h
// Purpose: wxSpinButton class
// Author: Robert Roebling
// Modified by:
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
+
// implementation
void OnSize( wxSizeEvent &event );
/////////////////////////////////////////////////////////////////////////////
-// Name: spinctrl.h
+// Name: wx/gtk1/spinctrl.h
// Purpose: wxSpinCtrl class
// Author: Robert Roebling
// Modified by:
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
+
// implementation
void OnChar( wxKeyEvent &event );
-
+
bool IsOwnGtkWindow( GdkWindow *window );
void GtkDisableEvents();
void GtkEnableEvents();
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/statbmp.h
+// Name: wx/gtk1/statbmp.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
+
private:
wxBitmap m_bitmap;
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/stabox.h
+// Name: wx/gtk1/stabox.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
protected:
void DoApplyWidgetStyle(GtkRcStyle *style);
-
+
private:
DECLARE_DYNAMIC_CLASS(wxStaticBox)
};
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/statline.h
+// Name: wx/gtk1/statline.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: stattext.h
+// Name: wx/gtk1/stattext.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
wxWindowID id,
const wxString &label,
const wxPoint &pos = wxDefaultPosition,
- const wxSize &size = wxDefaultSize,
+ const wxSize &size = wxDefaultSize,
long style = 0,
const wxString &name = wxStaticTextNameStr );
wxWindowID id,
const wxString &label,
const wxPoint &pos = wxDefaultPosition,
- const wxSize &size = wxDefaultSize,
+ const wxSize &size = wxDefaultSize,
long style = 0,
const wxString &name = wxStaticTextNameStr );
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
+
// see wx/stattext.h
void Wrap(int width);
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
-
+
virtual wxSize DoGetBestSize() const;
DECLARE_DYNAMIC_CLASS(wxStaticText)
/////////////////////////////////////////////////////////////////////////////
-// Name: tbargtk.h
+// Name: wx/gtk1/tbargtk.h
// Purpose: GTK toolbar
// Author: Robert Roebling
// RCS-ID: $Id$
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
+
// implementation from now on
// --------------------------
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/textctrl.h
+// Name: wx/gtk1/textctrl.h
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
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();
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; }
// 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();
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)
};
/////////////////////////////////////////////////////////////////////////////
-// 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
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
+
// implementation
bool m_blockEvent;
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/timer.h
+// Name: wx/gtk1/timer.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: tooltip.h
+// Name: wx/gtk1/tooltip.h
// Purpose: wxToolTip class
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/toplevel.h
+// Name: wx/gtk1/toplevel.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
/////////////////////////////////////////////////////////////////////////////
-// Name: treectrl.h
+// Name: wx/gtk1/treectrl.h
// Purpose: wxTreeCtrl class
// Author: Denis Pershin
// Modified by:
/* ///////////////////////////////////////////////////////////////////////////
-// Name: win_gtk.h
+// Name: wx/gtk1/win_gtk.h
// Purpose: wxWidgets's GTK base widget = GtkPizza
// Author: Robert Roebling
// Id: $Id$
#include <gdk/gdkx.h>
#include <gtk/gtkcontainer.h>
#include <gtk/gtkadjustment.h>
-#ifndef __WXGTK20__
#include <gtk/gtkfeatures.h>
-#endif
#include "wx/dlimpexp.h"
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/window.h
+// Name: wx/gtk1/window.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
virtual void SetDropTarget( wxDropTarget *dropTarget );
#endif // wxUSE_DRAG_AND_DROP
-#ifdef __WXGTK20__
- virtual void AddChild( wxWindowBase *child );
- virtual void RemoveChild( wxWindowBase *child );
-#endif
-
// implementation
// --------------
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
// 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;
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
// 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,
projects / wxWidgets.git / commitdiff
