projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert wxFlexGridSizer constr. change
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
dnd.h
diff --git
a/include/wx/gtk1/dnd.h
b/include/wx/gtk1/dnd.h
index 9bc4868523dc265235deeb1ac8ed53d6b148c87b..01187d8a4749e293a1efb9fb6880295e9a63169a 100644
(file)
--- a/
include/wx/gtk1/dnd.h
+++ b/
include/wx/gtk1/dnd.h
@@
-1,20
+1,15
@@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-// Name: dnd.h
+// Name:
wx/gtk1/
dnd.h
// Purpose: declaration of the wxDropTarget class
// Author: Robert Roebling
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin, Robert Roebling
// Purpose: declaration of the wxDropTarget class
// Author: Robert Roebling
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin, Robert Roebling
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-
#ifndef __GTKDNDH__
#define __GTKDNDH__
#ifndef __GTKDNDH__
#define __GTKDNDH__
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
-
#if wxUSE_DRAG_AND_DROP
#include "wx/object.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/object.h"
@@
-28,13
+23,13
@@
// classes
//-------------------------------------------------------------------------
// classes
//-------------------------------------------------------------------------
-class wxWindow;
+class
WXDLLIMPEXP_FWD_CORE
wxWindow;
-class wxDropTarget;
-class wxTextDropTarget;
-class wxFileDropTarget;
+class
WXDLLIMPEXP_FWD_CORE
wxDropTarget;
+class
WXDLLIMPEXP_FWD_CORE
wxTextDropTarget;
+class
WXDLLIMPEXP_FWD_CORE
wxFileDropTarget;
-class wxDropSource;
+class
WXDLLIMPEXP_FWD_CORE
wxDropSource;
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
// macros
@@
-50,10
+45,10
@@
class wxDropSource;
// wxDropTarget
//-------------------------------------------------------------------------
// wxDropTarget
//-------------------------------------------------------------------------
-class wxDropTarget: public wxDropTargetBase
+class
WXDLLIMPEXP_CORE
wxDropTarget: public wxDropTargetBase
{
public:
{
public:
- wxDropTarget(wxDataObject *dataObject =
(wxDataObject*)
NULL );
+ wxDropTarget(wxDataObject *dataObject = NULL );
virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
virtual bool OnDrop(wxCoord x, wxCoord y);
virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
virtual bool OnDrop(wxCoord x, wxCoord y);
@@
-62,7
+57,7
@@
public:
// implementation
// implementation
- GdkAtom GetMatchingPair();
+ GdkAtom GetMatchingPair(
bool quiet = false
);
void RegisterWidget( GtkWidget *widget );
void UnregisterWidget( GtkWidget *widget );
void RegisterWidget( GtkWidget *widget );
void UnregisterWidget( GtkWidget *widget );
@@
-83,11
+78,11
@@
public:
// wxDropSource
//-------------------------------------------------------------------------
// wxDropSource
//-------------------------------------------------------------------------
-class wxDropSource: public wxDropSourceBase
+class
WXDLLIMPEXP_CORE
wxDropSource: public wxDropSourceBase
{
public:
// constructor. set data later with SetData()
{
public:
// constructor. set data later with SetData()
- wxDropSource( wxWindow *win =
(wxWindow *)
NULL,
+ wxDropSource( wxWindow *win = NULL,
const wxIcon © = wxNullIcon,
const wxIcon &move = wxNullIcon,
const wxIcon &none = wxNullIcon);
const wxIcon © = wxNullIcon,
const wxIcon &move = wxNullIcon,
const wxIcon &none = wxNullIcon);