Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-10-25 20:03:39 +00:00
parent 257980e6f2
commit 16a12a3d27
19 changed files with 600 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/defs.h
View File

@@ -1565,7 +1565,7 @@ typedef long WXLPARAM;
# define LOGFONT FATTRS
# define LOWORD SHORT1FROMMP
# define HIWORD SHORT2FROMMP
#endif
#endif // __WXMSW__
typedef unsigned long WXCOLORREF;
typedef void * WXRGNDATA;
typedef void * WXMSG;
@@ -1583,6 +1583,7 @@ typedef unsigned long WXMSGID;
typedef void* WXRESULT;
typedef int (*WXFARPROC)();
// some windows handles not defined by PM
typedef unsigned long COLORREF;
typedef unsigned long HANDLE;
typedef unsigned long HICON;
typedef unsigned long HFONT;

2
include/wx/html/helpctrl.h
View File

@@ -20,7 +20,7 @@
#if wxUSE_HTML
#include "helpfrm.h"
#include "wx/html/helpfrm.h"
class WXDLLEXPORT wxHtmlHelpController : public wxEvtHandler
{

2
include/wx/html/helpfrm.h
View File

@@ -20,7 +20,7 @@
#if wxUSE_HTML
#include "helpdata.h"
#include "wx/html/helpdata.h"
#include "wx/window.h"
#include "wx/frame.h"
#include "wx/config.h"

45
include/wx/os2/dnd.h
View File

@@ -64,7 +64,6 @@ public:
virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
virtual bool OnDrop(wxCoord x, wxCoord y);
virtual bool OnData(wxCoord x, wxCoord y);
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult vResult);
virtual bool GetData();
@@ -76,49 +75,5 @@ protected:
DRAGTRANSFER* m_pDragTransfer;
};
// ----------------------------------------------------------------------------
// A simple wxDropTarget derived class for text data: you only need to
// override OnDropText() to get something working
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxTextDropTarget : public wxDropTarget
{
public:
wxTextDropTarget();
virtual ~wxTextDropTarget();
virtual bool OnDropText( wxCoord x
,wxCoord y
,const wxString& rText
) = 0;
virtual bool OnData( wxCoord x
,wxCoord y
);
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult vResult);
};
// ----------------------------------------------------------------------------
// A drop target which accepts files (dragged from File Manager or Explorer)
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxFileDropTarget : public wxDropTarget
{
public:
wxFileDropTarget();
virtual ~wxFileDropTarget();
// parameters are the number of files and the array of file names
virtual bool OnDropFiles( wxCoord x
,wxCoord y
,const wxArrayString& rFilenames
) = 0;
virtual bool OnData( wxCoord x
,wxCoord y
);
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult vResult);
};
#endif //__OS2DNDH__