new module definition file for OS/2 Dll build.

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

diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index c2087c9682fe429dc26691032dd329cf3baa1731..ffc229f538eda2ef681291dd2408998aa7c90e31 100644 (file)
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -56,6 +56,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 +71,7 @@ public:
 private:
     ScintillaWX* swx;
 };
 private:
     ScintillaWX* swx;
 };

-
+#endif

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


@@ -97,8 +98,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,14 +120,17 @@ 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 DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown);

     void DoAddChar(char ch);
     void DoAddChar(char ch);

-    int  DoKeyDown(int key, bool shift, bool ctrl, bool alt);
+    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);


@@ -140,8 +148,11 @@ private:
     bool                capturedMouse;
     wxStyledTextCtrl*   stc;
 
     bool                capturedMouse;
     wxStyledTextCtrl*   stc;
 

+#if wxUSE_DRAG_AND_DROP

     wxSTCDropTarget*    dropTarget;
     wxDragResult        dragResult;
     wxSTCDropTarget*    dropTarget;
     wxDragResult        dragResult;

+#endif
+    int                 wheelRotation;

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