Fix text's left/right margins under GTK+

Author: vslavik

src/spellchecking.cpp

@@ -26,6 +26,7 @@
 #include "spellchecking.h"
 
 #include "str_helpers.h"
+#include "text_control.h"
 
 #ifdef __WXGTK__
     #include <gtk/gtk.h>
@@ -46,27 +47,10 @@
 
 
 #ifdef __WXGTK__
-// helper functions that finds GtkTextView of wxTextCtrl:
-static GtkTextView *GetTextView(wxTextCtrl *ctrl)
-{
-    GtkWidget *parent = ctrl->m_widget;
-    GList *child = gtk_container_get_children(GTK_CONTAINER(parent));
-    while (child)
-    {
-        if (GTK_IS_TEXT_VIEW(child->data))
-        {
-            return GTK_TEXT_VIEW(child->data);
-        }
-        child = child->next;
-    }
-
-    wxFAIL_MSG( "couldn't find GtkTextView for text control" );
-    return NULL;
-}
 
-bool InitTextCtrlSpellchecker(wxTextCtrl *text, bool enable, const Language& lang)
+bool InitTextCtrlSpellchecker(CustomizedTextCtrl *text, bool enable, const Language& lang)
 {
-    GtkTextView *textview = GetTextView(text);
+    GtkTextView *textview = GTK_TEXT_VIEW(text->GetGtkTextView());
     wxASSERT_MSG( textview, "wxTextCtrl is supposed to use GtkTextView" );
 
     GtkSpellChecker *spell = gtk_spell_checker_get_from_text_view(textview);
@@ -100,7 +84,7 @@ bool SetSpellcheckerLang(const wxString& lang)
     return [sc setLanguage: nslang];
 }
 
-bool InitTextCtrlSpellchecker(wxTextCtrl *text, bool enable, const Language& /*lang*/)
+bool InitTextCtrlSpellchecker(CustomizedTextCtrl *text, bool enable, const Language& /*lang*/)
 {
     NSScrollView *scroll = (NSScrollView*)text->GetHandle();
     NSTextView *view = [scroll documentView];
@@ -113,7 +97,7 @@ bool InitTextCtrlSpellchecker(wxTextCtrl *text, bool enable, const Language& /*l
 #endif // __WXOSX__
 
 #ifdef __WXMSW__
-void PrepareTextCtrlForSpellchecker(wxTextCtrl *text)
+void PrepareTextCtrlForSpellchecker(CustomizedTextCtrl *text)
 {
     // Set spellchecking-friendly style on the text control. Enabling spellchecking
     // itself is done with EM_SETLANGOPTIONS in InitTextCtrlSpellchecker()
@@ -122,7 +106,7 @@ void PrepareTextCtrlForSpellchecker(wxTextCtrl *text)
     ::SendMessage(hwnd, EM_SETEDITSTYLE, editStyle, editStyle);
 }
 
-bool InitTextCtrlSpellchecker(wxTextCtrl *text, bool enable, const Language& /*lang*/)
+bool InitTextCtrlSpellchecker(CustomizedTextCtrl *text, bool enable, const Language& /*lang*/)
 {
     HWND hwnd = (HWND) text->GetHWND();
     auto langOptions = ::SendMessage(hwnd, EM_GETLANGOPTIONS, 0, 0);

src/spellchecking.h

@@ -32,10 +32,11 @@
     #include <wx/platinfo.h>
 #endif
 
-#include <wx/textctrl.h>
-
 #include "language.h"
 
+class CustomizedTextCtrl;
+
+
 inline bool IsSpellcheckingAvailable()
 {
 #ifdef __WXMSW__
@@ -52,11 +53,11 @@ bool SetSpellcheckerLang(const wxString& lang);
 
 // Does any initialization needed to be able to use spellchecker with the control later.
 #ifdef __WXMSW__
-void PrepareTextCtrlForSpellchecker(wxTextCtrl *text);
+void PrepareTextCtrlForSpellchecker(CustomizedTextCtrl *text);
 #endif
 
 // Init given text control to do (or not) spellchecking for given language
-bool InitTextCtrlSpellchecker(wxTextCtrl *text, bool enable, const Language& lang);
+bool InitTextCtrlSpellchecker(CustomizedTextCtrl *text, bool enable, const Language& lang);
 
 #ifndef __WXMSW__
 // Show help about how to add more dictionaries for spellchecking.

src/text_control.cpp

@@ -33,6 +33,10 @@
   #import <Foundation/NSUndoManager.h>
 #endif
 
+#ifdef __WXGTK__
+    #include <gtk/gtk.h>
+#endif
+
 #ifdef __WXMSW__
   #include <windows.h>
   #include <richedit.h>
@@ -305,10 +309,16 @@ CustomizedTextCtrl::CustomizedTextCtrl(wxWindow *parent, wxWindowID winid, long
 {
     wxTextCtrl::Create(parent, winid, "", wxDefaultPosition, wxDefaultSize, style | ALWAYS_USED_STYLE);
 
+#ifdef __WXGTK__
+    GtkTextView *tv = GTK_TEXT_VIEW(GetGtkTextView());
+    gtk_text_view_set_left_margin(tv, 5);
+    gtk_text_view_set_right_margin(tv, 5);
+#else
     wxTextAttr padding;
     padding.SetLeftIndent(9);
     padding.SetRightIndent(9);
     SetDefaultStyle(padding);
+#endif
 
     Bind(wxEVT_TEXT_COPY, &CustomizedTextCtrl::OnCopy, this);
     Bind(wxEVT_TEXT_CUT, &CustomizedTextCtrl::OnCut, this);
@@ -506,6 +516,26 @@ void CustomizedTextCtrl::Redo()
     SetInsertionPoint(m_history[m_historyIndex].insertionPoint);
     m_historyIndex++;
 }
+
+void *CustomizedTextCtrl::GetGtkTextView() const
+{
+    // helper function that finds GtkTextView of wxTextCtrl
+
+    GtkWidget *parent = m_widget;
+    GList *child = gtk_container_get_children(GTK_CONTAINER(parent));
+    while (child)
+    {
+        if (GTK_IS_TEXT_VIEW(child->data))
+        {
+            return GTK_TEXT_VIEW(child->data);
+        }
+        child = child->next;
+    }
+
+    wxFAIL_MSG( "couldn't find GtkTextView for text control" );
+    return nullptr;
+}
+
 #endif // __WXGTK__
 
 void CustomizedTextCtrl::ShowFindIndicator(int from, int length)

src/text_control.h

@@ -58,6 +58,8 @@ class CustomizedTextCtrl : public wxTextCtrl
     void BeginUndoGrouping();
     void EndUndoGrouping();
     void SaveSnapshot();
+
+    void *GetGtkTextView() const;
 #endif
 
 #ifdef __WXMSW__