Compilation fixes for wxUSE_STL == 1 and for wxUSE_UNICODE == 1.

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

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index 3e5ebf0aa601b080725de47a78aae96f1b384435..6acb7805d1a7996cc1e8831ecf9099f809d7442f 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -136,6 +136,7 @@ END_EVENT_TABLE()
 
 ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
     capturedMouse = false;
 
 ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) {
     capturedMouse = false;

+    focusEvent = false;

     wMain = win;
     stc   = win;
     wheelRotation = 0;
     wMain = win;
     stc   = win;
     wheelRotation = 0;


@@ -333,6 +334,18 @@ void ScintillaWX::NotifyParent(SCNotification scn) {
 }
 
 
 }
 
 

+// This method is overloaded from ScintillaBase in order to prevent the
+// AutoComplete window from being destroyed when it gets the focus.  There is
+// a side effect that the AutoComp will also not be destroyed when switching
+// to another window, but I think that is okay.
+void ScintillaWX::CancelModes() {
+    if (! focusEvent)
+        AutoCompleteCancel();
+    ct.CallTipCancel();
+    Editor::CancelModes();
+}
+
+

 
 void ScintillaWX::Copy() {
     if (currentPos != anchor) {
 
 void ScintillaWX::Copy() {
     if (currentPos != anchor) {


@@ -383,7 +396,8 @@ bool ScintillaWX::CanPaste() {
     bool didOpen;
 
     if (Editor::CanPaste()) {
     bool didOpen;
 
     if (Editor::CanPaste()) {

-        if ( (didOpen = !wxTheClipboard->IsOpened()) )
+        didOpen = !wxTheClipboard->IsOpened();
+        if ( didOpen )

             wxTheClipboard->Open();
 
         if (wxTheClipboard->IsOpened()) {
             wxTheClipboard->Open();
 
         if (wxTheClipboard->IsOpened()) {


@@ -408,7 +422,7 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
     if (!label[0])
         ((wxMenu*)popup.GetID())->AppendSeparator();
     else
     if (!label[0])
         ((wxMenu*)popup.GetID())->AppendSeparator();
     else

-        ((wxMenu*)popup.GetID())->Append(cmd, stc2wx(label));
+        ((wxMenu*)popup.GetID())->Append(cmd, wxGetTranslation(stc2wx(label)));

 
     if (!enabled)
         ((wxMenu*)popup.GetID())->Enable(cmd, enabled);
 
     if (!enabled)
         ((wxMenu*)popup.GetID())->Enable(cmd, enabled);


@@ -597,7 +611,7 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta,
 }
 
 
 }
 
 

-void ScintillaWX::DoSize(int width, int height) {
+void ScintillaWX::DoSize(int WXUNUSED(width), int WXUNUSED(height)) {

 //      PRectangle rcClient(0,0,width,height);
 //      SetScrollBarsTo(rcClient);
 //      DropGraphics();
 //      PRectangle rcClient(0,0,width,height);
 //      SetScrollBarsTo(rcClient);
 //      DropGraphics();


@@ -605,11 +619,15 @@ void ScintillaWX::DoSize(int width, int height) {
 }
 
 void ScintillaWX::DoLoseFocus(){
 }
 
 void ScintillaWX::DoLoseFocus(){

+    focusEvent = true;

     SetFocusState(false);
     SetFocusState(false);

+    focusEvent = false;

 }
 
 void ScintillaWX::DoGainFocus(){
 }
 
 void ScintillaWX::DoGainFocus(){

+    focusEvent = true;

     SetFocusState(true);
     SetFocusState(true);

+    focusEvent = false;

 }
 
 void ScintillaWX::DoSysColourChange() {
 }
 
 void ScintillaWX::DoSysColourChange() {


@@ -628,8 +646,8 @@ void ScintillaWX::DoLeftButtonMove(Point pt) {
     ButtonMove(pt);
 }
 
     ButtonMove(pt);
 }
 

-void ScintillaWX::DoMiddleButtonUp(Point pt) {

 #ifdef __WXGTK__
 #ifdef __WXGTK__

+void ScintillaWX::DoMiddleButtonUp(Point pt) {

     // Set the current position to the mouse click point and
     // then paste in the PRIMARY selection, if any.  wxGTK only.
     int newPos = PositionFromLocation(pt);
     // Set the current position to the mouse click point and
     // then paste in the PRIMARY selection, if any.  wxGTK only.
     int newPos = PositionFromLocation(pt);


@@ -656,8 +674,11 @@ void ScintillaWX::DoMiddleButtonUp(Point pt) {
 
     ShowCaretAtCurrentPosition();
     EnsureCaretVisible();
 
     ShowCaretAtCurrentPosition();
     EnsureCaretVisible();

-#endif

 }
 }

+#else
+void ScintillaWX::DoMiddleButtonUp(Point WXUNUSED(pt)) {
+}
+#endif

 
 
 void ScintillaWX::DoAddChar(int key) {
 
 
 void ScintillaWX::DoAddChar(int key) {


@@ -673,9 +694,14 @@ void ScintillaWX::DoAddChar(int key) {
 }
 
 
 }
 
 

-int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed) {
+#ifdef __WXMAC__
+int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool meta, bool* consumed) {
+#else
+int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool WXUNUSED(meta), bool* consumed) {
+#endif

 #if defined(__WXGTK__) || defined(__WXMAC__)
 #if defined(__WXGTK__) || defined(__WXMAC__)

-    // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK...
+    // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK
+    // TODO:  Check this, it shouldn't be true any longer.

     if (ctrl && key >= 1 && key <= 26)
         key += 'A' - 1;
 #endif
     if (ctrl && key >= 1 && key <= 26)
         key += 'A' - 1;
 #endif


@@ -709,6 +735,22 @@ int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* cons
     case WXK_MENU:              key = 0; break;
     }
 
     case WXK_MENU:              key = 0; break;
     }
 

+#ifdef __WXMAC__
+    if ( meta ) {
+        // check for a few common Mac Meta-key combos and remap them to Ctrl
+        // for Scintilla
+        switch ( key ) {
+        case 'Z':       // Undo
+        case 'X':       // Cut
+        case 'C':       // Copy
+        case 'V':       // Paste
+        case 'A':       // Select All
+            ctrl = true;
+            break;
+        }
+    }
+#endif
+    

     int rv = KeyDown(key, shift, ctrl, alt, consumed);
 
     if (key)
     int rv = KeyDown(key, shift, ctrl, alt, consumed);
 
     if (key)


@@ -760,7 +802,7 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
 }
 
 
 }
 
 

-wxDragResult ScintillaWX::DoDragEnter(wxCoord x, wxCoord y, wxDragResult def) {
+wxDragResult ScintillaWX::DoDragEnter(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult def) {

     dragResult = def;
     return dragResult;
 }
     dragResult = def;
     return dragResult;
 }


@@ -817,8 +859,8 @@ void ScintillaWX::DoScrollToColumn(int column) {
     HorizontalScrollTo(column * vs.spaceWidth);
 }
 
     HorizontalScrollTo(column * vs.spaceWidth);
 }
 

-void ScintillaWX::ClipChildren(wxDC& dc, PRectangle rect) {

 #ifdef __WXGTK__
 #ifdef __WXGTK__

+void ScintillaWX::ClipChildren(wxDC& dc, PRectangle rect) {

     wxRegion rgn(wxRectFromPRectangle(rect));
     if (ac.Active()) {
         wxRect childRect = ((wxWindow*)ac.lb->GetID())->GetRect();
     wxRegion rgn(wxRectFromPRectangle(rect));
     if (ac.Active()) {
         wxRect childRect = ((wxWindow*)ac.lb->GetID())->GetRect();


@@ -830,9 +872,11 @@ void ScintillaWX::ClipChildren(wxDC& dc, PRectangle rect) {
     }
 
     dc.SetClippingRegion(rgn);
     }
 
     dc.SetClippingRegion(rgn);

-#endif

 }
 }

-
+#else
+void ScintillaWX::ClipChildren(wxDC& WXUNUSED(dc), PRectangle WXUNUSED(rect)) {
+}
+#endif

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