implemented wxSS::GetMetric on wxGTK2 (patch 950618)

[wxWidgets.git] / src / common / textcmn.cpp

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 57e584a3106e28dfcadea07399fb670537fbaf3f..98bec4e7265354767f44b2bfa9ab6735d007640e 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     13.07.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     13.07.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -13,7 +13,7 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "textctrlbase.h"
 #endif
 
     #pragma implementation "textctrlbase.h"
 #endif
 


@@ -77,6 +77,7 @@ wxTextAttr::wxTextAttr(const wxColour& colText,
 {
     m_flags = 0;
     m_leftIndent = 0;
 {
     m_flags = 0;
     m_leftIndent = 0;

+    m_leftSubIndent = 0;

     m_rightIndent = 0;
     if (m_colText.Ok()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR;
     if (m_colBack.Ok()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR;
     m_rightIndent = 0;
     if (m_colText.Ok()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR;
     if (m_colBack.Ok()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR;


@@ -90,6 +91,7 @@ void wxTextAttr::Init()
     m_textAlignment = wxTEXT_ALIGNMENT_DEFAULT;
     m_flags = 0;
     m_leftIndent = 0;
     m_textAlignment = wxTEXT_ALIGNMENT_DEFAULT;
     m_flags = 0;
     m_leftIndent = 0;

+    m_leftSubIndent = 0;

     m_rightIndent = 0;
 }
 
     m_rightIndent = 0;
 }
 


@@ -138,9 +140,9 @@ wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr,
         newAttr.SetTabs(attrDef.GetTabs());
     
     if (attr.HasLeftIndent())
         newAttr.SetTabs(attrDef.GetTabs());
     
     if (attr.HasLeftIndent())

-        newAttr.SetLeftIndent(attr.GetLeftIndent());
+        newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent());

     else if (attrDef.HasLeftIndent())
     else if (attrDef.HasLeftIndent())

-        newAttr.SetLeftIndent(attrDef.GetLeftIndent());
+        newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent());

     
     if (attr.HasRightIndent())
         newAttr.SetRightIndent(attr.GetRightIndent());
     
     if (attr.HasRightIndent())
         newAttr.SetRightIndent(attr.GetRightIndent());


@@ -157,6 +159,7 @@ void wxTextAttr::operator= (const wxTextAttr& attr)
     m_colBack = attr.m_colBack;
     m_textAlignment = attr.m_textAlignment;
     m_leftIndent = attr.m_leftIndent;
     m_colBack = attr.m_colBack;
     m_textAlignment = attr.m_textAlignment;
     m_leftIndent = attr.m_leftIndent;

+    m_leftSubIndent = attr.m_leftSubIndent;

     m_rightIndent = attr.m_rightIndent;
     m_tabs = attr.m_tabs;
     m_flags = attr.m_flags;
     m_rightIndent = attr.m_rightIndent;
     m_tabs = attr.m_tabs;
     m_flags = attr.m_flags;


@@ -230,7 +233,7 @@ bool wxTextCtrlBase::LoadFile(const wxString& filename)
 bool wxTextCtrlBase::SaveFile(const wxString& filename)
 {
     wxString filenameToUse = filename.IsEmpty() ? m_filename : filename;
 bool wxTextCtrlBase::SaveFile(const wxString& filename)
 {
     wxString filenameToUse = filename.IsEmpty() ? m_filename : filename;

-    if ( !filenameToUse )
+    if ( filenameToUse.empty() )

     {
         // what kind of message to give? is it an error or a program bug?
         wxLogDebug(wxT("Can't save textctrl to file without filename."));
     {
         // what kind of message to give? is it an error or a program bug?
         wxLogDebug(wxT("Can't save textctrl to file without filename."));


@@ -239,19 +242,20 @@ bool wxTextCtrlBase::SaveFile(const wxString& filename)
     }
 
 #if wxUSE_FFILE
     }
 
 #if wxUSE_FFILE

-    wxFFile file(filename, _T("w"));
+    wxFFile file(filenameToUse, _T("w"));

     if ( file.IsOpened() && file.Write(GetValue()) )
     {
         // it's not modified any longer
         DiscardEdits();
 
     if ( file.IsOpened() && file.Write(GetValue()) )
     {
         // it's not modified any longer
         DiscardEdits();
 

-        m_filename = filename;
+        // if it worked, save for future calls
+        m_filename = filenameToUse;

 
         return TRUE;
     }
 
         return TRUE;
     }

+#endif // wxUSE_FFILE

 
     wxLogError(_("The text couldn't be saved."));
 
     wxLogError(_("The text couldn't be saved."));

-#endif // wxUSE_FFILE

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -347,10 +351,15 @@ bool wxTextCtrlBase::CanPaste() const
 // emulating key presses
 // ----------------------------------------------------------------------------
 
 // emulating key presses
 // ----------------------------------------------------------------------------
 

+#ifdef __WIN32__
+// the generic version is unused in wxMSW
+bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& WXUNUSED(event))
+{
+    return FALSE;
+}
+#else // !__WIN32__

 bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
 {
 bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
 {

-    // the generic version is unused in wxMSW
-#ifndef __WIN32__

     wxChar ch = 0;
     int keycode = event.GetKeyCode();
     switch ( keycode )
     wxChar ch = 0;
     int keycode = event.GetKeyCode();
     switch ( keycode )


@@ -436,10 +445,10 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
 
         return TRUE;
     }
 
         return TRUE;
     }

-#endif // !__WIN32__

 
     return FALSE;
 }
 
     return FALSE;
 }

+#endif // !__WIN32__

 
 // ----------------------------------------------------------------------------
 // selection and ranges
 
 // ----------------------------------------------------------------------------
 // selection and ranges


@@ -469,6 +478,32 @@ wxString wxTextCtrlBase::GetRange(long from, long to) const
     return sel;
 }
 
     return sel;
 }
 

+// do the window-specific processing after processing the update event
+void wxTextCtrlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
+{
+    if ( event.GetSetEnabled() )
+        Enable(event.GetEnabled());
+    
+    if ( event.GetSetText() )
+    {
+        if ( event.GetText() != GetValue() )
+            SetValue(event.GetText());
+    }    
+}
+
+// ----------------------------------------------------------------------------
+// hit testing
+// ----------------------------------------------------------------------------
+
+wxTextCtrlHitTestResult
+wxTextCtrlBase::HitTest(const wxPoint& WXUNUSED(pt),
+                        wxTextCoord * WXUNUSED(col),
+                        wxTextCoord * WXUNUSED(row)) const
+{
+    // not implemented
+    return wxTE_HT_UNKNOWN;
+}
+

 #else // !wxUSE_TEXTCTRL
 
 // define this one even if !wxUSE_TEXTCTRL because it is also used by other
 #else // !wxUSE_TEXTCTRL
 
 // define this one even if !wxUSE_TEXTCTRL because it is also used by other