The mmedia contrib requires sys/soundcard.h on unix, so disable it on unix

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

diff --git a/contrib/src/stc/ScintillaWX.h b/contrib/src/stc/ScintillaWX.h
index a902db5ed64ffcd317152ec79bf71feea6ae4410..e703efe606873775137cca5f1119bf3cd3c31929 100644 (file)
--- a/contrib/src/stc/ScintillaWX.h
+++ b/contrib/src/stc/ScintillaWX.h
@@ -48,10 +48,6 @@
 #include "Editor.h"
 #include "ScintillaBase.h"
 
 #include "Editor.h"
 #include "ScintillaBase.h"
 

-#include <wx/wx.h>
-#include <wx/dataobj.h>
-#include <wx/clipbrd.h>
-#include <wx/dnd.h>

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


@@ -127,6 +123,8 @@ public:
 
     virtual void CancelModes();
 
 
     virtual void CancelModes();
 

+    virtual void UpdateSystemCaret();
+

     // Event delegates
     void DoPaint(wxDC* dc, wxRect rect);
     void DoHScroll(int type, int pos);
     // Event delegates
     void DoPaint(wxDC* dc, wxRect rect);
     void DoHScroll(int type, int pos);


@@ -141,7 +139,7 @@ public:
     void DoMiddleButtonUp(Point pt);
     void DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown, bool isPageScroll);
     void DoAddChar(int key);
     void DoMiddleButtonUp(Point pt);
     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 meta, bool* consumed);
+    int  DoKeyDown(const wxKeyEvent& event, bool* consumed);

     void DoTick() { Tick(); }
     void DoOnIdle(wxIdleEvent& evt);
 
     void DoTick() { Tick(); }
     void DoOnIdle(wxIdleEvent& evt);
 


@@ -178,7 +176,16 @@ private:
 #endif
     int                 wheelRotation;
 
 #endif
     int                 wheelRotation;
 

-
+    // For use in creating a system caret
+    bool HasCaretSizeChanged();
+    bool CreateSystemCaret();
+    bool DestroySystemCaret();
+#ifdef __WXMSW__
+    HBITMAP sysCaretBitmap;
+    int sysCaretWidth;
+    int sysCaretHeight;
+#endif
+    

     friend class wxSTCCallTip;
 };
 
     friend class wxSTCCallTip;
 };