AddBook ignores wxMac paths (still won't work)

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

diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index d25eb1818805588d2f8c9207f03347584ecf3106..fdd4f98dbdf3e8d6e882fcc208c75d22ed06436c 100644 (file)
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -97,8 +97,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,6 +119,7 @@ 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);

     void DoAddChar(char ch);
     int  DoKeyDown(int key, bool shift, bool ctrl, bool alt);
     void DoTick() { Tick(); }
     void DoAddChar(char ch);
     int  DoKeyDown(int key, bool shift, bool ctrl, bool alt);
     void DoTick() { Tick(); }


@@ -126,6 +131,7 @@ public:
 
     void DoCommand(int ID);
     void DoContextMenu(Point pt);
 
     void DoCommand(int ID);
     void DoContextMenu(Point pt);

+    void DoOnListBox();

 
 
     // helpers
 
 
     // helpers


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

-    wxTextDataObject    textDO;
-    wxSTCDropTarget     dropTarget;
+    wxSTCDropTarget*    dropTarget;

     wxDragResult        dragResult;
     wxDragResult        dragResult;

+    int                 wheelRotation;

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