Fixed typos and SWIG #ifdef stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -48,6 +48,15 @@
|
||||
#endif // SWIG
|
||||
|
||||
|
||||
// SWIG can't handle "#if" type of conditionals, only "#ifdef"
|
||||
#ifdef SWIG
|
||||
#define STC_USE_DND 1
|
||||
#else
|
||||
#if wxUSE_DRAG_AND_DROP
|
||||
#define STC_USE_DND 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
// Should a wxPopupWindow be used for the call tips and autocomplete windows?
|
||||
@@ -2283,7 +2292,8 @@ public:
|
||||
|
||||
// Load the contents of filename into the editor
|
||||
bool LoadFile(const wxString& filename);
|
||||
#ifdef wxUSE_DRAG_DROP
|
||||
|
||||
#ifdef STC_USE_DND
|
||||
// Allow for simulating a DnD DragOver
|
||||
wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def);
|
||||
|
||||
@@ -2341,15 +2351,6 @@ protected:
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
// SWIG can't handle "#if" type of conditionals, only "#ifdef"
|
||||
#ifdef SWIG
|
||||
#define STC_USE_DND 1
|
||||
#else
|
||||
#if wxUSE_DRAG_AND_DROP
|
||||
#define STC_USE_DND 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
class wxStyledTextEvent : public wxCommandEvent {
|
||||
public:
|
||||
wxStyledTextEvent(wxEventType commandType=0, int id=0);
|
||||
|
||||
Reference in New Issue
Block a user