remove unnecessary GTK declarations from defs.h, move things only used once to the place that needs them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -14,6 +14,8 @@
|
||||
#include "wx/icon.h"
|
||||
#include "wx/strconv.h"
|
||||
|
||||
typedef struct _GdkVisual GdkVisual;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// classes
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -53,7 +55,7 @@ public:
|
||||
|
||||
bool IsInAssert() const { return m_isInAssert; }
|
||||
|
||||
gint m_idleTag;
|
||||
int m_idleTag;
|
||||
void RemoveIdleTag();
|
||||
|
||||
unsigned char *m_colorCube;
|
||||
|
@@ -31,7 +31,7 @@ typedef struct _GtkFrame GtkFrame;
|
||||
// C-linkage function pointer types for GetDefaultAttributesFromGTKWidget
|
||||
extern "C" {
|
||||
typedef GtkWidget* (*wxGtkWidgetNew_t)(void);
|
||||
typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const gchar*);
|
||||
typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const char*);
|
||||
typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*);
|
||||
}
|
||||
|
||||
|
@@ -65,13 +65,13 @@ public:
|
||||
GdkDragContext *m_dragContext;
|
||||
GtkWidget *m_dragWidget;
|
||||
GtkSelectionData *m_dragData;
|
||||
guint m_dragTime;
|
||||
unsigned m_dragTime;
|
||||
bool m_firstMotion; // gdk has no "gdk_drag_enter" event
|
||||
|
||||
void SetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
|
||||
void SetDragWidget( GtkWidget *w ) { m_dragWidget = w; }
|
||||
void SetDragData( GtkSelectionData *sd ) { m_dragData = sd; }
|
||||
void SetDragTime( guint time ) { m_dragTime = time; }
|
||||
void SetDragTime(unsigned time) { m_dragTime = time; }
|
||||
};
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
|
@@ -12,6 +12,8 @@
|
||||
|
||||
#include "wx/list.h"
|
||||
|
||||
typedef struct _GtkList GtkList;
|
||||
|
||||
class WXDLLIMPEXP_FWD_BASE wxSortedArrayString;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@@ -23,9 +23,9 @@
|
||||
class WXDLLIMPEXP_FWD_CORE wxPen;
|
||||
|
||||
#if defined(__WXGTK127__)
|
||||
typedef gint8 wxGTKDash;
|
||||
typedef signed char wxGTKDash;
|
||||
#else
|
||||
typedef gchar wxGTKDash;
|
||||
typedef char wxGTKDash;
|
||||
#endif
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@@ -11,6 +11,10 @@
|
||||
#define __GTKWINDOWH__
|
||||
|
||||
typedef struct _GtkTooltips GtkTooltips;
|
||||
#ifdef HAVE_XIM
|
||||
typedef struct _GdkIC GdkIC;
|
||||
typedef struct _GdkICAttr GdkICAttr;
|
||||
#endif
|
||||
|
||||
// helper structure that holds class that holds GtkIMContext object and
|
||||
// some additional data needed for key events processing
|
||||
|
Reference in New Issue
Block a user