new file added

[wxWidgets.git] / src / gtk / textctrl.cpp

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 6a6b14820e5f32c083905ab8af8f8d0cad051a0b..eedc7c026f6bbe7f20d79c6406a17285f2bf2868 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -30,7 +30,9 @@
 #include <sys/stat.h>
 #include <ctype.h>
 
 #include <sys/stat.h>
 #include <ctype.h>
 

+#include <gtk/gtk.h>

 #include "wx/gtk/private.h"
 #include "wx/gtk/private.h"

+#include "wx/gtk/private/gtk2-compat.h"

 
 // ----------------------------------------------------------------------------
 // helpers
 
 // ----------------------------------------------------------------------------
 // helpers


@@ -167,25 +169,29 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
         GtkJustification align;
         switch (attr.GetAlignment())
         {
         GtkJustification align;
         switch (attr.GetAlignment())
         {

-            default:
-                align = GTK_JUSTIFY_LEFT;
-                break;

             case wxTEXT_ALIGNMENT_RIGHT:
                 align = GTK_JUSTIFY_RIGHT;
                 break;
             case wxTEXT_ALIGNMENT_CENTER:
                 align = GTK_JUSTIFY_CENTER;
                 break;
             case wxTEXT_ALIGNMENT_RIGHT:
                 align = GTK_JUSTIFY_RIGHT;
                 break;
             case wxTEXT_ALIGNMENT_CENTER:
                 align = GTK_JUSTIFY_CENTER;
                 break;

+            case wxTEXT_ALIGNMENT_JUSTIFIED:
+#ifdef __WXGTK3__
+                align = GTK_JUSTIFY_FILL;
+                break;
+#elif GTK_CHECK_VERSION(2,11,0)

 // gtk+ doesn't support justify before gtk+-2.11.0 with pango-1.17 being available
 // (but if new enough pango isn't available it's a mere gtk warning)
 // gtk+ doesn't support justify before gtk+-2.11.0 with pango-1.17 being available
 // (but if new enough pango isn't available it's a mere gtk warning)

-#if GTK_CHECK_VERSION(2,11,0)
-            case wxTEXT_ALIGNMENT_JUSTIFIED:

                 if (!gtk_check_version(2,11,0))
                 if (!gtk_check_version(2,11,0))

+                {

                     align = GTK_JUSTIFY_FILL;
                     align = GTK_JUSTIFY_FILL;

-                else
-                    align = GTK_JUSTIFY_LEFT;
-                break;
+                    break;
+                }
+                // fallthrough

 #endif
 #endif

+            default:
+                align = GTK_JUSTIFY_LEFT;
+                break;

         }
 
         g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align);
         }
 
         g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align);


@@ -787,7 +793,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
             GtkTextIter start, end;
 
             // We create our wxUrl tag here for slight efficiency gain - we
             GtkTextIter start, end;
 
             // We create our wxUrl tag here for slight efficiency gain - we

-            // don't have to check for the tag existance in callbacks,
+            // don't have to check for the tag existence in callbacks,

             // hereby it's guaranteed to exist.
             gtk_text_buffer_create_tag(m_buffer, "wxUrl",
                                        "foreground", "blue",
             // hereby it's guaranteed to exist.
             gtk_text_buffer_create_tag(m_buffer, "wxUrl",
                                        "foreground", "blue",


@@ -1599,7 +1605,7 @@ bool wxTextCtrl::IsEditable() const
 
     if ( IsMultiLine() )
     {
 
     if ( IsMultiLine() )
     {

-        return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text));
+        return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text)) != 0;

     }
     else
     {
     }
     else
     {


@@ -1645,7 +1651,12 @@ GdkWindow *wxTextCtrl::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
     }
     else
     {
     }
     else
     {

+#ifdef __WXGTK3__
+        // no access to internal GdkWindows
+        return NULL;
+#else

         return gtk_entry_get_text_window(GTK_ENTRY(m_text));
         return gtk_entry_get_text_window(GTK_ENTRY(m_text));

+#endif

     }
 }
 
     }
 }
 


@@ -1792,7 +1803,7 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
 
 void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
 {
 
 void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
 {

-    gtk_widget_modify_style(m_text, style);
+    GTKApplyStyle(m_text, style);

 }
 
 void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))


@@ -1953,7 +1964,7 @@ void wxTextCtrl::OnUrlMouseEvent(wxMouseEvent& event)
         gtk_text_iter_forward_to_tag_toggle(&end, tag);
 
     // Native context menu is probably not desired on an URL.
         gtk_text_iter_forward_to_tag_toggle(&end, tag);
 
     // Native context menu is probably not desired on an URL.

-    // Consider making this dependant on ProcessEvent(wxTextUrlEvent) return value
+    // Consider making this dependent on ProcessEvent(wxTextUrlEvent) return value

     if(event.GetEventType() == wxEVT_RIGHT_DOWN)
         event.Skip(false);
 
     if(event.GetEventType() == wxEVT_RIGHT_DOWN)
         event.Skip(false);