added .chm support for Unix (Markus Sinner)

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

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index f294cd6ba2f24c96583333f99f387952b1c67859..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) {


@@ -409,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);


@@ -606,11 +619,15 @@ void ScintillaWX::DoSize(int WXUNUSED(width), int WXUNUSED(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() {


@@ -677,7 +694,11 @@ void ScintillaWX::DoAddChar(int key) {
 }
 
 
 }
 
 

+#ifdef __WXMAC__

 int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool meta, bool* consumed) {
 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__)
     // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK
     // TODO:  Check this, it shouldn't be true any longer.
 #if defined(__WXGTK__) || defined(__WXMAC__)
     // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK
     // TODO:  Check this, it shouldn't be true any longer.


@@ -726,7 +747,8 @@ int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool meta,
         case 'A':       // Select All
             ctrl = true;
             break;
         case 'A':       // Select All
             ctrl = true;
             break;

-        }                
+        }
+    }

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