Warning fixes, source cleaning.

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

diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in
index 4cc177306fdeb4d35c55fb4386947b63d120edd8..6e626e3bef272310d862558d85eb17b73586f12b 100644 (file)
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 // Name:        stc.cpp
 ////////////////////////////////////////////////////////////////////////////
 // Name:        stc.cpp

-// Purpose:     A wxWindows implementation of Scintilla.  This class is the
+// Purpose:     A wxWidgets implementation of Scintilla.  This class is the

 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, but instead
 //              delegates most things to the real Scintilla class.
 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, but instead
 //              delegates most things to the real Scintilla class.


@@ -76,7 +76,6 @@ DEFINE_EVENT_TYPE( wxEVT_STC_MODIFIED )
 DEFINE_EVENT_TYPE( wxEVT_STC_MACRORECORD )
 DEFINE_EVENT_TYPE( wxEVT_STC_MARGINCLICK )
 DEFINE_EVENT_TYPE( wxEVT_STC_NEEDSHOWN )
 DEFINE_EVENT_TYPE( wxEVT_STC_MACRORECORD )
 DEFINE_EVENT_TYPE( wxEVT_STC_MARGINCLICK )
 DEFINE_EVENT_TYPE( wxEVT_STC_NEEDSHOWN )

-DEFINE_EVENT_TYPE( wxEVT_STC_POSCHANGED )

 DEFINE_EVENT_TYPE( wxEVT_STC_PAINTED )
 DEFINE_EVENT_TYPE( wxEVT_STC_USERLISTSELECTION )
 DEFINE_EVENT_TYPE( wxEVT_STC_URIDROPPED )
 DEFINE_EVENT_TYPE( wxEVT_STC_PAINTED )
 DEFINE_EVENT_TYPE( wxEVT_STC_USERLISTSELECTION )
 DEFINE_EVENT_TYPE( wxEVT_STC_URIDROPPED )


@@ -150,8 +149,11 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
                                    long style,
                                    const wxString& name)
 {
                                    long style,
                                    const wxString& name)
 {

+#ifdef __WXMAC__
+    style |= wxVSCROLL | wxHSCROLL;
+#endif

     wxControl::Create(parent, id, pos, size,
     wxControl::Create(parent, id, pos, size,

-              style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
+              style | wxWANTS_CHARS | wxCLIP_CHILDREN,

               wxDefaultValidator, name);
 
 #ifdef LINK_LEXERS
               wxDefaultValidator, name);
 
 #ifdef LINK_LEXERS


@@ -166,6 +168,8 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
     // Put Scintilla into unicode (UTF-8) mode
     SetCodePage(wxSTC_CP_UTF8);
 #endif
     // Put Scintilla into unicode (UTF-8) mode
     SetCodePage(wxSTC_CP_UTF8);
 #endif

+
+    SetBestFittingSize(size);

 }
 
 
 }
 
 


@@ -349,20 +353,19 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
     if (file.IsOpened())
     {
         wxString contents;
     if (file.IsOpened())
     {
         wxString contents;

-#if wxUSE_UNICODE
-        wxMemoryBuffer buffer;
-#else
-        wxString buffer;
-#endif

         off_t len = file.Length();
         if (len > 0)
         {
         off_t len = file.Length();
         if (len > 0)
         {

-            void *bufptr = buffer.GetWriteBuf(len);
-            success = (file.Read(bufptr, len) == len);
-            buffer.UngetWriteBuf(len);

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-            contents = wxString(buffer, *wxConvCurrent);
+            wxMemoryBuffer buffer(len+1);
+            success = (file.Read(buffer.GetData(), len) == len);
+           if (success) {
+                ((char*)buffer.GetData())[len] = 0;
+                contents = wxString(buffer, *wxConvCurrent, len);
+            }

 #else
 #else

+            wxString buffer;
+            success = (file.Read(wxStringBuffer(buffer, len), len) == len);

             contents = buffer;
 #endif
         }
             contents = buffer;
 #endif
         }


@@ -393,6 +396,14 @@ bool wxStyledTextCtrl::DoDropText(long x, long y, const wxString& data) {
 #endif
 
 
 #endif
 
 

+void wxStyledTextCtrl::SetUseAntiAliasing(bool useAA) {
+    m_swx->SetUseAntiAliasing(useAA);
+}
+
+bool wxStyledTextCtrl::GetUseAntiAliasing() {
+    return m_swx->GetUseAntiAliasing();
+}
+

 //----------------------------------------------------------------------
 // Event handlers
 
 //----------------------------------------------------------------------
 // Event handlers
 


@@ -458,6 +469,14 @@ void wxStyledTextCtrl::OnMouseMiddleUp(wxMouseEvent& evt) {
 void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) {
     wxPoint pt = evt.GetPosition();
     ScreenToClient(&pt.x, &pt.y);
 void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) {
     wxPoint pt = evt.GetPosition();
     ScreenToClient(&pt.x, &pt.y);

+    /*
+      Show context menu at event point if it's within the window,
+      or at caret location if not
+    */
+    wxHitTest ht = this->HitTest(pt);
+    if (ht != wxHT_WINDOW_INSIDE) {
+        pt = this->PointFromPosition(this->GetCurrentPos());
+    }

     m_swx->DoContextMenu(Point(pt.x, pt.y));
 }
 
     m_swx->DoContextMenu(Point(pt.x, pt.y));
 }
 


@@ -485,7 +504,7 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
 //     printf("OnChar key:%%d  consumed:%%d  ctrl:%%d  alt:%%d  skip:%%d\n",
 //            key, m_lastKeyDownConsumed, ctrl, alt, skip);
 
 //     printf("OnChar key:%%d  consumed:%%d  ctrl:%%d  alt:%%d  skip:%%d\n",
 //            key, m_lastKeyDownConsumed, ctrl, alt, skip);
 

-    if ( (key <= WXK_START || key > WXK_NUMPAD_DIVIDE) &&
+    if ( (key <= WXK_START || key > WXK_COMMAND) &&

          !m_lastKeyDownConsumed && !skip) {
         m_swx->DoAddChar(key);
         return;
          !m_lastKeyDownConsumed && !skip) {
         m_swx->DoAddChar(key);
         return;


@@ -511,13 +530,15 @@ void wxStyledTextCtrl::OnKeyDown(wxKeyEvent& evt) {
 }
 
 
 }
 
 

-void wxStyledTextCtrl::OnLoseFocus(wxFocusEvent& WXUNUSED(evt)) {
+void wxStyledTextCtrl::OnLoseFocus(wxFocusEvent& evt) {

     m_swx->DoLoseFocus();
     m_swx->DoLoseFocus();

+    evt.Skip();

 }
 
 
 }
 
 

-void wxStyledTextCtrl::OnGainFocus(wxFocusEvent& WXUNUSED(evt)) {
+void wxStyledTextCtrl::OnGainFocus(wxFocusEvent& evt) {

     m_swx->DoGainFocus();
     m_swx->DoGainFocus();

+    evt.Skip();

 }
 
 
 }
 
 


@@ -542,6 +563,19 @@ void wxStyledTextCtrl::OnListBox(wxCommandEvent& WXUNUSED(evt)) {
 }
 
 
 }
 
 

+void wxStyledTextCtrl::OnIdle(wxIdleEvent& evt) {
+    m_swx->DoOnIdle(evt);
+}
+
+
+wxSize wxStyledTextCtrl::DoGetBestSize() const
+{
+    // What would be the best size for a wxSTC?
+    // Just give a reasonable minimum until something else can be figured out.
+    return wxSize(200,100);
+}
+
+

 //----------------------------------------------------------------------
 // Turn notifications from Scintilla into events
 
 //----------------------------------------------------------------------
 // Turn notifications from Scintilla into events