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

Changed two conflicting defines in defs.h

Browse Source 
DnD multiformat fine-tuning


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-10-19 15:12:11 +00:00
parent 98f026a6e4
commit a3e7d24d21
7 changed files with 147 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/wx/defs.h
View File

@@ -973,19 +973,19 @@ enum wxStretch
/*
* wxSpinButton flags
*/
#define wxSP_VERTICAL 0x0004
#define wxSP_HORIZONTAL 0x0008
#define wxSP_ARROW_KEYS 0x0010
#define wxSP_WRAP 0x0020
#define wxSP_HORIZONTAL wxHORIZONTAL // 4
#define wxSP_VERTICAL wxVERTICAL // 8
#define wxSP_ARROW_KEYS 0x0010
#define wxSP_WRAP 0x0020
/*
* wxSplitterWindow flags
*/
#define wxSP_NOBORDER 0x0000
#define wxSP_3D 0x0004
#define wxSP_BORDER 0x0008
#define wxSP_PERMIT_UNSPLIT 0x0010
#define wxSP_LIVE_UPDATE 0x0020
#define wxSP_NOBORDER 0x0000
#define wxSP_3D 0x0010
#define wxSP_BORDER 0x0020
#define wxSP_PERMIT_UNSPLIT 0x0040
#define wxSP_LIVE_UPDATE 0x0080
/*
* wxFrame extra flags
@@ -997,14 +997,14 @@ enum wxStretch
* wxTabCtrl flags
*/
#define wxTC_MULTILINE 0x0000
#define wxTC_RIGHTJUSTIFY 0x0004
#define wxTC_FIXEDWIDTH 0x0008
#define wxTC_OWNERDRAW 0x0010
#define wxTC_RIGHTJUSTIFY 0x0010
#define wxTC_FIXEDWIDTH 0x0020
#define wxTC_OWNERDRAW 0x0040
/*
* wxNotebook flags
*/
#define wxNB_FIXEDWIDTH 0x0008
#define wxNB_FIXEDWIDTH 0x0010
#define wxNB_LEFT 0x0020
#define wxNB_RIGHT 0x0040
#define wxNB_BOTTOM 0x0080
@@ -1012,7 +1012,7 @@ enum wxStretch
/*
* wxStatusBar95 flags
*/
#define wxST_SIZEGRIP 0x0002
#define wxST_SIZEGRIP 0x0010
/*
* wxStaticLine flags

16
include/wx/gtk/dnd.h
View File

@@ -79,6 +79,9 @@ public:
/* fill data with data from the dragging source */
bool GetData( wxDataObject *data );
virtual size_t GetFormatCount() const = 0;
virtual wxDataFormat GetFormat(size_t n) const = 0;
// implementation
void RegisterWidget( GtkWidget *widget );
@@ -106,13 +109,15 @@ public:
wxTextDropTarget() {}
virtual bool OnMove( long x, long y );
virtual bool OnDrop( long x, long y );
virtual bool OnData( long x, long y );
/* you have to override OnDropData to get at the text */
virtual bool OnDropText( long x, long y, const wxChar *text ) = 0;
virtual size_t GetFormatCount() const
{ return 1; }
virtual wxDataFormat GetFormat(size_t n) const
{ return wxDF_TEXT; }
};
//-------------------------------------------------------------------------
@@ -152,11 +157,14 @@ public:
wxFileDropTarget() {}
virtual bool OnMove( long x, long y );
virtual bool OnDrop( long x, long y );
virtual bool OnData( long x, long y );
virtual bool OnDropFiles( long x, long y, size_t nFiles, const wxChar * const aszFiles[] ) = 0;
virtual size_t GetFormatCount() const
{ return 1; }
virtual wxDataFormat GetFormat(size_t n) const
{ return wxDF_FILENAME; }
};
//-------------------------------------------------------------------------

16
include/wx/gtk1/dnd.h
View File

@@ -79,6 +79,9 @@ public:
/* fill data with data from the dragging source */
bool GetData( wxDataObject *data );
virtual size_t GetFormatCount() const = 0;
virtual wxDataFormat GetFormat(size_t n) const = 0;
// implementation
void RegisterWidget( GtkWidget *widget );
@@ -106,13 +109,15 @@ public:
wxTextDropTarget() {}
virtual bool OnMove( long x, long y );
virtual bool OnDrop( long x, long y );
virtual bool OnData( long x, long y );
/* you have to override OnDropData to get at the text */
virtual bool OnDropText( long x, long y, const wxChar *text ) = 0;
virtual size_t GetFormatCount() const
{ return 1; }
virtual wxDataFormat GetFormat(size_t n) const
{ return wxDF_TEXT; }
};
//-------------------------------------------------------------------------
@@ -152,11 +157,14 @@ public:
wxFileDropTarget() {}
virtual bool OnMove( long x, long y );
virtual bool OnDrop( long x, long y );
virtual bool OnData( long x, long y );
virtual bool OnDropFiles( long x, long y, size_t nFiles, const wxChar * const aszFiles[] ) = 0;
virtual size_t GetFormatCount() const
{ return 1; }
virtual wxDataFormat GetFormat(size_t n) const
{ return wxDF_FILENAME; }
};
//-------------------------------------------------------------------------