another wxFont OS2 blind build fix

[wxWidgets.git] / src / stc / stc.cpp.in

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index b36707101257b8170a938fe101976187febac68e..3ce6e5c982d1e34cee83b02355307fa4bc11c131 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -15,20 +15,45 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+/*
+    IMPORTANT: src/stc/stc.cpp is generated by src/stc/gen_iface.py from
+               src/stc/stc.cpp.in, don't edit stc.cpp file as your changes will be
+               lost after the next regeneration, edit stc.cpp.in and rerun the
+               gen_iface.py script instead!
+
+               Parts of this file generated by the script are found in between
+               the special "{{{" and "}}}" markers, the rest of it is copied
+               verbatim from src.h.in.
+ */
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_STC
+
+#include "wx/stc/stc.h"
+#include "wx/stc/private.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif // WX_PRECOMP
+

 #include <ctype.h>
 
 #include <ctype.h>
 

-#include "wx/wx.h"

 #include "wx/tokenzr.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/file.h"
 
 #include "wx/tokenzr.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/file.h"
 

-#include "wx/stc/stc.h"

 #include "ScintillaWX.h"
 
 //----------------------------------------------------------------------
 
 #include "ScintillaWX.h"
 
 //----------------------------------------------------------------------
 

-const wxChar* wxSTCNameStr = wxT("stcwindow");
+const char wxSTCNameStr[] = "stcwindow";

 
 #ifdef MAKELONG
 #undef MAKELONG
 
 #ifdef MAKELONG
 #undef MAKELONG


@@ -96,6 +121,9 @@ DEFINE_EVENT_TYPE( wxEVT_STC_ZOOM )
 DEFINE_EVENT_TYPE( wxEVT_STC_HOTSPOT_CLICK )
 DEFINE_EVENT_TYPE( wxEVT_STC_HOTSPOT_DCLICK )
 DEFINE_EVENT_TYPE( wxEVT_STC_CALLTIP_CLICK )
 DEFINE_EVENT_TYPE( wxEVT_STC_HOTSPOT_CLICK )
 DEFINE_EVENT_TYPE( wxEVT_STC_HOTSPOT_DCLICK )
 DEFINE_EVENT_TYPE( wxEVT_STC_CALLTIP_CLICK )

+DEFINE_EVENT_TYPE( wxEVT_STC_AUTOCOMP_SELECTION )
+DEFINE_EVENT_TYPE( wxEVT_STC_INDICATOR_CLICK )
+DEFINE_EVENT_TYPE( wxEVT_STC_INDICATOR_RELEASE )

 
 
 
 
 
 


@@ -157,9 +185,7 @@ bool wxStyledTextCtrl::Create(wxWindow *parent,
                               long style,
                               const wxString& name)
 {
                               long style,
                               const wxString& name)
 {

-#ifdef __WXMAC__

     style |= wxVSCROLL | wxHSCROLL;
     style |= wxVSCROLL | wxHSCROLL;

-#endif

     if (!wxControl::Create(parent, id, pos, size,
                            style | wxWANTS_CHARS | wxCLIP_CHILDREN,
                            wxDefaultValidator, name))
     if (!wxControl::Create(parent, id, pos, size,
                            style | wxWANTS_CHARS | wxCLIP_CHILDREN,
                            wxDefaultValidator, name))


@@ -171,6 +197,7 @@ bool wxStyledTextCtrl::Create(wxWindow *parent,
     m_swx = new ScintillaWX(this);
     m_stopWatch.Start();
     m_lastKeyDownConsumed = false;
     m_swx = new ScintillaWX(this);
     m_stopWatch.Start();
     m_lastKeyDownConsumed = false;

+    m_lastWheelTimestamp = 0;

     m_vScrollBar = NULL;
     m_hScrollBar = NULL;
 #if wxUSE_UNICODE
     m_vScrollBar = NULL;
     m_hScrollBar = NULL;
 #if wxUSE_UNICODE


@@ -178,10 +205,14 @@ bool wxStyledTextCtrl::Create(wxWindow *parent,
     SetCodePage(wxSTC_CP_UTF8);
 #endif
 
     SetCodePage(wxSTC_CP_UTF8);
 #endif
 

-    SetBestFittingSize(size);
+    SetInitialSize(size);

 
     // Reduces flicker on GTK+/X11
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
 
     // Reduces flicker on GTK+/X11
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);

+
+    // Make sure it can take the focus
+    SetCanFocus(true);
+

     return true;
 }
 
     return true;
 }
 


@@ -193,8 +224,8 @@ wxStyledTextCtrl::~wxStyledTextCtrl() {
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-long wxStyledTextCtrl::SendMsg(int msg, long wp, long lp) {
-
+wxIntPtr wxStyledTextCtrl::SendMsg(int msg, wxUIntPtr wp, wxIntPtr lp) const
+{

     return m_swx->WndProc(msg, wp, lp);
 }
 
     return m_swx->WndProc(msg, wp, lp);
 }
 


@@ -220,13 +251,11 @@ void wxStyledTextCtrl::SetHScrollBar(wxScrollBar* bar)  {
 }
 
 //----------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------

-// BEGIN generated section.  The following code is automatically generated
-//       by gen_iface.py from the contents of Scintilla.iface.  Do not edit
-//       this file.  Edit stc.cpp.in or gen_iface.py instead and regenerate.
+// Generated methods implementation section {{{

 
 %(METHOD_IMPS)s
 
 
 %(METHOD_IMPS)s
 

-// END of generated section
+//}}}

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


@@ -288,6 +317,25 @@ void wxStyledTextCtrl::StyleSetSpec(int styleNum, const wxString& spec) {
 }
 
 
 }
 
 

+// Get the font of a style
+wxFont wxStyledTextCtrl::StyleGetFont(int style) {
+    wxFont font;
+    font.SetPointSize(StyleGetSize(style));
+    font.SetFaceName(StyleGetFaceName(style));
+    if( StyleGetBold(style) )
+        font.SetWeight(wxFONTWEIGHT_BOLD);
+    else
+        font.SetWeight(wxFONTWEIGHT_NORMAL);
+
+    if( StyleGetItalic(style) )
+        font.SetStyle(wxFONTSTYLE_ITALIC);
+    else
+        font.SetStyle(wxFONTSTYLE_NORMAL);
+
+    return font;
+}
+
+

 // Set style size, face, bold, italic, and underline attributes from
 // a wxFont's attributes.
 void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
 // Set style size, face, bold, italic, and underline attributes from
 // a wxFont's attributes.
 void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {


@@ -302,7 +350,7 @@ void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
     bool           italic   = font.GetStyle() != wxNORMAL;
     bool           under    = font.GetUnderlined();
     wxFontEncoding encoding = font.GetEncoding();
     bool           italic   = font.GetStyle() != wxNORMAL;
     bool           under    = font.GetUnderlined();
     wxFontEncoding encoding = font.GetEncoding();

-    
+

     StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
 }
 
     StyleSetFontAttr(styleNum, size, faceName, bold, italic, under, encoding);
 }
 


@@ -402,6 +450,14 @@ void wxStyledTextCtrl::StyleSetCharacterSet(int style, int characterSet)
         case wxSTC_CHARSET_THAI:
             encoding = wxFONTENCODING_ISO8859_11;
             break;
         case wxSTC_CHARSET_THAI:
             encoding = wxFONTENCODING_ISO8859_11;
             break;

+
+        case wxSTC_CHARSET_CYRILLIC:
+            encoding = wxFONTENCODING_ISO8859_5;
+            break;
+
+        case wxSTC_CHARSET_8859_15:
+            encoding = wxFONTENCODING_ISO8859_15;;
+            break;

     }
 
     // We just have Scintilla track the wxFontEncoding for us.  It gets used
     }
 
     // We just have Scintilla track the wxFontEncoding for us.  It gets used


@@ -433,15 +489,6 @@ void wxStyledTextCtrl::SetMargins(int left, int right) {
 }
 
 
 }
 
 

-// Retrieve the start and end positions of the current selection.
-void wxStyledTextCtrl::GetSelection(int* startPos, int* endPos) {
-    if (startPos != NULL)
-        *startPos = SendMsg(SCI_GETSELECTIONSTART);
-    if (endPos != NULL)
-        *endPos = SendMsg(SCI_GETSELECTIONEND);
-}
-
-

 // Retrieve the point in the window where a position is displayed.
 wxPoint wxStyledTextCtrl::PointFromPosition(int pos) {
     int x = SendMsg(SCI_POINTXFROMPOSITION, 0, pos);
 // Retrieve the point in the window where a position is displayed.
 wxPoint wxStyledTextCtrl::PointFromPosition(int pos) {
     int x = SendMsg(SCI_POINTXFROMPOSITION, 0, pos);


@@ -461,7 +508,11 @@ void wxStyledTextCtrl::ScrollToColumn(int column) {
 }
 
 
 }
 
 

+#if wxUSE_TEXTCTRL
+bool wxStyledTextCtrl::DoSaveFile(const wxString& filename, int WXUNUSED(fileType))
+#else

 bool wxStyledTextCtrl::SaveFile(const wxString& filename)
 bool wxStyledTextCtrl::SaveFile(const wxString& filename)

+#endif

 {
     wxFile file(filename, wxFile::write);
 
 {
     wxFile file(filename, wxFile::write);
 


@@ -476,7 +527,11 @@ bool wxStyledTextCtrl::SaveFile(const wxString& filename)
     return success;
 }
 
     return success;
 }
 

+#if wxUSE_TEXTCTRL
+bool wxStyledTextCtrl::DoLoadFile(const wxString& filename, int WXUNUSED(fileType))
+#else

 bool wxStyledTextCtrl::LoadFile(const wxString& filename)
 bool wxStyledTextCtrl::LoadFile(const wxString& filename)

+#endif

 {
     bool success = false;
     wxFile file(filename, wxFile::read);
 {
     bool success = false;
     wxFile file(filename, wxFile::read);


@@ -548,12 +603,12 @@ bool wxStyledTextCtrl::GetUseAntiAliasing() {
 
 void wxStyledTextCtrl::AddTextRaw(const char* text)
 {
 
 void wxStyledTextCtrl::AddTextRaw(const char* text)
 {

-    SendMsg(SCI_ADDTEXT, strlen(text), (long)text);
+    SendMsg(SCI_ADDTEXT, strlen(text), (sptr_t)text);

 }
 
 void wxStyledTextCtrl::InsertTextRaw(int pos, const char* text)
 {
 }
 
 void wxStyledTextCtrl::InsertTextRaw(int pos, const char* text)
 {

-    SendMsg(SCI_INSERTTEXT, pos, (long)text);
+    SendMsg(SCI_INSERTTEXT, pos, (sptr_t)text);

 }
 
 wxCharBuffer wxStyledTextCtrl::GetCurLineRaw(int* linePos)
 }
 
 wxCharBuffer wxStyledTextCtrl::GetCurLineRaw(int* linePos)


@@ -566,7 +621,7 @@ wxCharBuffer wxStyledTextCtrl::GetCurLineRaw(int* linePos)
     }
 
     wxCharBuffer buf(len);
     }
 
     wxCharBuffer buf(len);

-    int pos = SendMsg(SCI_GETCURLINE, len, (long)buf.data());
+    int pos = SendMsg(SCI_GETCURLINE, len, (sptr_t)buf.data());

     if (linePos)  *linePos = pos;
     return buf;
 }
     if (linePos)  *linePos = pos;
     return buf;
 }


@@ -580,24 +635,24 @@ wxCharBuffer wxStyledTextCtrl::GetLineRaw(int line)
     }
 
     wxCharBuffer buf(len);
     }
 
     wxCharBuffer buf(len);

-    SendMsg(SCI_GETLINE, line, (long)buf.data());
+    SendMsg(SCI_GETLINE, line, (sptr_t)buf.data());

     return buf;
 }
 
 wxCharBuffer wxStyledTextCtrl::GetSelectedTextRaw()
 {
     return buf;
 }
 
 wxCharBuffer wxStyledTextCtrl::GetSelectedTextRaw()
 {

-    int   start;
-    int   end;
+    long   start;
+    long   end;

 
     GetSelection(&start, &end);
     int   len  = end - start;
     if (!len) {
         wxCharBuffer empty;
         return empty;
 
     GetSelection(&start, &end);
     int   len  = end - start;
     if (!len) {
         wxCharBuffer empty;
         return empty;

-    }        
+    }

 
     wxCharBuffer buf(len);
 
     wxCharBuffer buf(len);

-    SendMsg(SCI_GETSELTEXT, 0, (long)buf.data());
+    SendMsg(SCI_GETSELTEXT, 0, (sptr_t)buf.data());

     return buf;
 }
 
     return buf;
 }
 


@@ -612,33 +667,33 @@ wxCharBuffer wxStyledTextCtrl::GetTextRangeRaw(int startPos, int endPos)
     if (!len) {
         wxCharBuffer empty;
         return empty;
     if (!len) {
         wxCharBuffer empty;
         return empty;

-    }        
+    }

 
     wxCharBuffer buf(len);
     TextRange tr;
     tr.lpstrText = buf.data();
     tr.chrg.cpMin = startPos;
     tr.chrg.cpMax = endPos;
 
     wxCharBuffer buf(len);
     TextRange tr;
     tr.lpstrText = buf.data();
     tr.chrg.cpMin = startPos;
     tr.chrg.cpMax = endPos;

-    SendMsg(SCI_GETTEXTRANGE, 0, (long)&tr);
+    SendMsg(SCI_GETTEXTRANGE, 0, (sptr_t)&tr);

     return buf;
 }
 
 void wxStyledTextCtrl::SetTextRaw(const char* text)
 {
     return buf;
 }
 
 void wxStyledTextCtrl::SetTextRaw(const char* text)
 {

-    SendMsg(SCI_SETTEXT, 0, (long)text);
+    SendMsg(SCI_SETTEXT, 0, (sptr_t)text);

 }
 
 wxCharBuffer wxStyledTextCtrl::GetTextRaw()
 {
 }
 
 wxCharBuffer wxStyledTextCtrl::GetTextRaw()
 {

-    int len  = GetTextLength();
-    wxCharBuffer buf(len);
-    SendMsg(SCI_GETTEXT, len, (long)buf.data());
+    int len = GetTextLength();
+    wxCharBuffer buf(len); // adds 1 for NUL automatically
+    SendMsg(SCI_GETTEXT, len + 1, (sptr_t)buf.data());

     return buf;
 }
 
 void wxStyledTextCtrl::AppendTextRaw(const char* text)
 {
     return buf;
 }
 
 void wxStyledTextCtrl::AppendTextRaw(const char* text)
 {

-    SendMsg(SCI_APPENDTEXT, strlen(text), (long)text);
+    SendMsg(SCI_APPENDTEXT, strlen(text), (sptr_t)text);

 }
 
 
 }
 
 


@@ -722,12 +777,21 @@ void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) {
 }
 
 
 }
 
 

-void wxStyledTextCtrl::OnMouseWheel(wxMouseEvent& evt) {
-    m_swx->DoMouseWheel(evt.GetWheelRotation(),
-                        evt.GetWheelDelta(),
-                        evt.GetLinesPerAction(),
-                        evt.ControlDown(),
-                        evt.IsPageScroll());
+void wxStyledTextCtrl::OnMouseWheel(wxMouseEvent& evt)
+{
+    // prevent having an event queue with wheel events that cannot be processed
+    // reasonably fast (see ticket #9057)
+    if ( m_lastWheelTimestamp <= evt.GetTimestamp() )
+    {
+        m_lastWheelTimestamp = m_stopWatch.Time();
+        m_swx->DoMouseWheel(evt.GetWheelRotation(),
+                            evt.GetWheelDelta(),
+                            evt.GetLinesPerAction(),
+                            evt.ControlDown(),
+                            evt.IsPageScroll());
+        m_lastWheelTimestamp = m_stopWatch.Time() - m_lastWheelTimestamp;
+        m_lastWheelTimestamp += evt.GetTimestamp();
+    }

 }
 
 
 }
 
 


@@ -747,6 +811,13 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
 #endif
     bool skip = ((ctrl || alt) && ! (ctrl && alt));
 
 #endif
     bool skip = ((ctrl || alt) && ! (ctrl && alt));
 

+#if wxUSE_UNICODE
+    // apparently if we don't do this, Unicode keys pressed after non-char
+    // ASCII ones (e.g. Enter, Tab) are not taken into account (patch 1615989)
+    if (m_lastKeyDownConsumed && evt.GetUnicodeKey() > 255)
+        m_lastKeyDownConsumed = false;
+#endif
+

     if (!m_lastKeyDownConsumed && !skip) {
 #if wxUSE_UNICODE
         int key = evt.GetUnicodeKey();
     if (!m_lastKeyDownConsumed && !skip) {
 #if wxUSE_UNICODE
         int key = evt.GetUnicodeKey();


@@ -772,7 +843,7 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
         }
 #endif
     }
         }
 #endif
     }

-    
+

     evt.Skip();
 }
 
     evt.Skip();
 }
 


@@ -845,12 +916,7 @@ static void SetEventText(wxStyledTextEvent& evt, const char* text,
                          size_t length) {
     if(!text) return;
 
                          size_t length) {
     if(!text) return;
 

-    // The unicode conversion MUST have a null byte to terminate the
-    // string so move it into a buffer first and give it one.
-    wxMemoryBuffer buf(length+1);
-    buf.AppendData((void*)text, length);
-    buf.AppendByte(0);
-    evt.SetText(stc2wx(buf));
+    evt.SetText(stc2wx(text, length));

 }
 
 
 }
 
 


@@ -928,10 +994,18 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
         evt.SetEventType(wxEVT_STC_PAINTED);
         break;
 
         evt.SetEventType(wxEVT_STC_PAINTED);
         break;
 

+    case SCN_AUTOCSELECTION:
+        evt.SetEventType(wxEVT_STC_AUTOCOMP_SELECTION);
+        evt.SetListType(scn.listType);
+        SetEventText(evt, scn.text, strlen(scn.text));
+        evt.SetPosition(scn.lParam);
+        break;
+

     case SCN_USERLISTSELECTION:
         evt.SetEventType(wxEVT_STC_USERLISTSELECTION);
         evt.SetListType(scn.listType);
         SetEventText(evt, scn.text, strlen(scn.text));
     case SCN_USERLISTSELECTION:
         evt.SetEventType(wxEVT_STC_USERLISTSELECTION);
         evt.SetListType(scn.listType);
         SetEventText(evt, scn.text, strlen(scn.text));

+        evt.SetPosition(scn.lParam);

         break;
 
     case SCN_URIDROPPED:
         break;
 
     case SCN_URIDROPPED:


@@ -967,6 +1041,14 @@ void wxStyledTextCtrl::NotifyParent(SCNotification* _scn) {
         evt.SetEventType(wxEVT_STC_CALLTIP_CLICK);
         break;
 
         evt.SetEventType(wxEVT_STC_CALLTIP_CLICK);
         break;
 

+    case SCN_INDICATORCLICK:
+        evt.SetEventType(wxEVT_STC_INDICATOR_CLICK);
+        break;
+
+    case SCN_INDICATORRELEASE:
+        evt.SetEventType(wxEVT_STC_INDICATOR_RELEASE);
+        break;
+

     default:
         return;
     }
     default:
         return;
     }


@@ -1043,11 +1125,4 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 

-
-
-
-
-
-
-
-
+#endif // wxUSE_STC