Fixed bug: wxPGProperty::SetName() crashed if it was called before property was added...

[wxWidgets.git] / include / wx / gtk / dnd.h

diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index af09892d616b4a8f36bafbc89f48a587b4712f62..ee679af13f5805b7a8beaf09d97828fac54988de 100644 (file)
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -36,12 +36,15 @@ public:
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool GetData();
 
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool GetData();
 

-  // implementation
+    // Can only be called during OnXXX methods.
+    wxDataFormat GetMatchingPair();

 
 

-    GdkAtom GetMatchingPair();
+    // implementation

 
 

-    void RegisterWidget( GtkWidget *widget );
-    void UnregisterWidget( GtkWidget *widget );
+    GdkAtom GtkGetMatchingPair(bool quiet = false);
+
+    void GtkRegisterWidget( GtkWidget *widget );
+    void GtkUnregisterWidget( GtkWidget *widget );

 
     GdkDragContext     *m_dragContext;
     GtkWidget          *m_dragWidget;
 
     GdkDragContext     *m_dragContext;
     GtkWidget          *m_dragWidget;


@@ -49,10 +52,10 @@ public:
     guint               m_dragTime;
     bool                m_firstMotion;     // gdk has no "gdk_drag_enter" event
 
     guint               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 GtkSetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
+    void GtkSetDragWidget( GtkWidget *w ) { m_dragWidget = w; }
+    void GtkSetDragData( GtkSelectionData *sd ) { m_dragData = sd; }
+    void GtkSetDragTime( guint time ) { m_dragTime = time; }

 };
 
 //-------------------------------------------------------------------------
 };
 
 //-------------------------------------------------------------------------