Don't use a wxPopupWindow on wxGTK

[wxWidgets.git] / contrib / src / stc / ScintillaWX.h

diff --git a/contrib/src/stc/ScintillaWX.h b/contrib/src/stc/ScintillaWX.h
index d25eb1818805588d2f8c9207f03347584ecf3106..5f879119520145958e92eb5393da82149dca4929 100644 (file)
--- a/contrib/src/stc/ScintillaWX.h
+++ b/contrib/src/stc/ScintillaWX.h
@@ -19,6 +19,11 @@
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+

 #include "Platform.h"
 
 #include "Scintilla.h"
 #include "Platform.h"
 
 #include "Scintilla.h"


@@ -56,6 +61,7 @@ class ScintillaWX;
 //----------------------------------------------------------------------
 // Helper classes
 
 //----------------------------------------------------------------------
 // Helper classes
 

+#if wxUSE_DRAG_AND_DROP

 class wxSTCDropTarget : public wxTextDropTarget {
 public:
     void SetScintilla(ScintillaWX* swx) {
 class wxSTCDropTarget : public wxTextDropTarget {
 public:
     void SetScintilla(ScintillaWX* swx) {


@@ -70,7 +76,7 @@ public:
 private:
     ScintillaWX* swx;
 };
 private:
     ScintillaWX* swx;
 };

-
+#endif

 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 


@@ -97,8 +103,12 @@ public:
     virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
     virtual void ClaimSelection();
 
     virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true);
     virtual void ClaimSelection();
 

-    virtual LRESULT DefWndProc(UINT iMessage, WPARAM wParam, LPARAM lParam);
-    virtual LRESULT WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam);
+    virtual long DefWndProc(unsigned int iMessage,
+                            unsigned long wParam,
+                            long lParam);
+    virtual long WndProc(unsigned int iMessage,
+                         unsigned long wParam,
+                         long lParam);

 
     virtual void NotifyChange();
     virtual void NotifyParent(SCNotification scn);
 
     virtual void NotifyChange();
     virtual void NotifyParent(SCNotification scn);


@@ -115,17 +125,21 @@ public:
     void DoButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
     void DoButtonUp(Point pt, unsigned int curTime, bool ctrl);
     void DoButtonMove(Point pt);
     void DoButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
     void DoButtonUp(Point pt, unsigned int curTime, bool ctrl);
     void DoButtonMove(Point pt);

-    void DoAddChar(char ch);
-    int  DoKeyDown(int key, bool shift, bool ctrl, bool alt);
+    void DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown, bool isPageScroll);
+    void DoAddChar(int key);
+    int  DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed);

     void DoTick() { Tick(); }
 
     void DoTick() { Tick(); }
 

+#if wxUSE_DRAG_AND_DROP

     bool DoDropText(long x, long y, const wxString& data);
     wxDragResult DoDragEnter(wxCoord x, wxCoord y, wxDragResult def);
     wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def);
     void DoDragLeave();
     bool DoDropText(long x, long y, const wxString& data);
     wxDragResult DoDragEnter(wxCoord x, wxCoord y, wxDragResult def);
     wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def);
     void DoDragLeave();

+#endif

 
     void DoCommand(int ID);
     void DoContextMenu(Point pt);
 
     void DoCommand(int ID);
     void DoContextMenu(Point pt);

+    void DoOnListBox();

 
 
     // helpers
 
 
     // helpers


@@ -139,9 +153,11 @@ private:
     bool                capturedMouse;
     wxStyledTextCtrl*   stc;
 
     bool                capturedMouse;
     wxStyledTextCtrl*   stc;
 

-    wxTextDataObject    textDO;
-    wxSTCDropTarget     dropTarget;
+#if wxUSE_DRAG_AND_DROP
+    wxSTCDropTarget*    dropTarget;

     wxDragResult        dragResult;
     wxDragResult        dragResult;

+#endif
+    int                 wheelRotation;

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