fix for bug 1371386, with some minor mods and cleanup

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

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 1b2b1f1532a2e723ff59c7a762ad81df78de2771..7d3c268389f1f0d1dde3f03af6ff4e7f94ef7077 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -13,10 +13,6 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "textctrlbase.h"
-#endif
-

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -53,18 +49,6 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN)
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN)
 

-// ----------------------------------------------------------------------------
-// ctor
-// ----------------------------------------------------------------------------
-
-wxTextCtrlBase::wxTextCtrlBase()
-{
-}
-
-wxTextCtrlBase::~wxTextCtrlBase()
-{
-}
-

 // ----------------------------------------------------------------------------
 // style functions - not implemented here
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // style functions - not implemented here
 // ----------------------------------------------------------------------------


@@ -128,27 +112,27 @@ wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr,
     }
 
     wxTextAttr newAttr(colFg, colBg, font);
     }
 
     wxTextAttr newAttr(colFg, colBg, font);

-    
+

     if (attr.HasAlignment())
         newAttr.SetAlignment(attr.GetAlignment());
     else if (attrDef.HasAlignment())
         newAttr.SetAlignment(attrDef.GetAlignment());
     if (attr.HasAlignment())
         newAttr.SetAlignment(attr.GetAlignment());
     else if (attrDef.HasAlignment())
         newAttr.SetAlignment(attrDef.GetAlignment());

-    
+

     if (attr.HasTabs())
         newAttr.SetTabs(attr.GetTabs());
     else if (attrDef.HasTabs())
         newAttr.SetTabs(attrDef.GetTabs());
     if (attr.HasTabs())
         newAttr.SetTabs(attr.GetTabs());
     else if (attrDef.HasTabs())
         newAttr.SetTabs(attrDef.GetTabs());

-    
+

     if (attr.HasLeftIndent())
         newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent());
     else if (attrDef.HasLeftIndent())
         newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent());
     if (attr.HasLeftIndent())
         newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent());
     else if (attrDef.HasLeftIndent())
         newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent());

-    
+

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

-        newAttr.SetRightIndent(attrDef.GetRightIndent());    
-    
+        newAttr.SetRightIndent(attrDef.GetRightIndent());
+

     return newAttr;
 }
 
     return newAttr;
 }
 


@@ -171,14 +155,14 @@ bool wxTextCtrlBase::SetStyle(long WXUNUSED(start), long WXUNUSED(end),
                               const wxTextAttr& WXUNUSED(style))
 {
     // to be implemented in derived TextCtrl classes
                               const wxTextAttr& WXUNUSED(style))
 {
     // to be implemented in derived TextCtrl classes

-    return FALSE;
+    return false;

 }
 
 // get the styling at the given position
 bool wxTextCtrlBase::GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style))
 {
     // to be implemented in derived TextCtrl classes
 }
 
 // get the styling at the given position
 bool wxTextCtrlBase::GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style))
 {
     // to be implemented in derived TextCtrl classes

-    return FALSE;
+    return false;

 }
 
 // change default text attributes
 }
 
 // change default text attributes


@@ -192,7 +176,7 @@ bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style)
     else
         m_defaultStyle = wxTextAttr::Combine(style, m_defaultStyle, this);
 
     else
         m_defaultStyle = wxTextAttr::Combine(style, m_defaultStyle, this);
 

-    return TRUE;
+    return true;

 }
 
 // get default text attributes
 }
 
 // get default text attributes


@@ -220,25 +204,25 @@ bool wxTextCtrlBase::LoadFile(const wxString& filename)
 
             m_filename = filename;
 
 
             m_filename = filename;
 

-            return TRUE;
+            return true;

         }
     }
 
     wxLogError(_("File couldn't be loaded."));
 #endif // wxUSE_FFILE
 
         }
     }
 
     wxLogError(_("File couldn't be loaded."));
 #endif // wxUSE_FFILE
 

-    return FALSE;
+    return false;

 }
 
 bool wxTextCtrlBase::SaveFile(const wxString& filename)
 {
 }
 
 bool wxTextCtrlBase::SaveFile(const wxString& filename)
 {

-    wxString filenameToUse = filename.IsEmpty() ? m_filename : filename;
+    wxString filenameToUse = filename.empty() ? m_filename : filename;

     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."));
 
     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."));
 

-        return FALSE;
+        return false;

     }
 
 #if wxUSE_FFILE
     }
 
 #if wxUSE_FFILE


@@ -251,13 +235,13 @@ bool wxTextCtrlBase::SaveFile(const wxString& filename)
         // if it worked, save for future calls
         m_filename = filenameToUse;
 
         // if it worked, save for future calls
         m_filename = filenameToUse;
 

-        return TRUE;
+        return true;

     }
 #endif // wxUSE_FFILE
 
     wxLogError(_("The text couldn't be saved."));
 
     }
 #endif // wxUSE_FFILE
 
     wxLogError(_("The text couldn't be saved."));
 

-    return FALSE;
+    return false;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -311,7 +295,7 @@ wxTextCtrl& wxTextCtrlBase::operator<<(const wxChar c)
 // streambuf methods implementation
 // ----------------------------------------------------------------------------
 
 // streambuf methods implementation
 // ----------------------------------------------------------------------------
 

-#ifndef NO_TEXT_WINDOW_STREAM
+#if wxHAS_TEXT_WINDOW_STREAM

 
 int wxTextCtrlBase::overflow(int c)
 {
 
 int wxTextCtrlBase::overflow(int c)
 {


@@ -321,7 +305,7 @@ int wxTextCtrlBase::overflow(int c)
     return 0;
 }
 
     return 0;
 }
 

-#endif // NO_TEXT_WINDOW_STREAM
+#endif // wxHAS_TEXT_WINDOW_STREAM

 
 // ----------------------------------------------------------------------------
 // clipboard stuff
 
 // ----------------------------------------------------------------------------
 // clipboard stuff


@@ -355,7 +339,7 @@ bool wxTextCtrlBase::CanPaste() const
 // the generic version is unused in wxMSW
 bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& WXUNUSED(event))
 {
 // the generic version is unused in wxMSW
 bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& WXUNUSED(event))
 {

-    return FALSE;
+    return false;

 }
 #else // !__WIN32__
 bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
 }
 #else // !__WIN32__
 bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)


@@ -374,7 +358,7 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
         case WXK_NUMPAD7:
         case WXK_NUMPAD8:
         case WXK_NUMPAD9:
         case WXK_NUMPAD7:
         case WXK_NUMPAD8:
         case WXK_NUMPAD9:

-            ch = _T('0') + keycode - WXK_NUMPAD0;
+            ch = (wxChar)(_T('0') + keycode - WXK_NUMPAD0);

             break;
 
         case WXK_MULTIPLY:
             break;
 
         case WXK_MULTIPLY:


@@ -406,9 +390,8 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
         case WXK_NUMPAD_DELETE:
             // delete the character at cursor
             {
         case WXK_NUMPAD_DELETE:
             // delete the character at cursor
             {

-                const long pos = GetInsertionPoint(),
-                           last = GetLastPosition();
-                if ( pos < last )
+                const long pos = GetInsertionPoint();
+                if ( pos < GetLastPosition() )

                     Remove(pos, pos + 1);
             }
             break;
                     Remove(pos, pos + 1);
             }
             break;


@@ -423,6 +406,13 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
             break;
 
         default:
             break;
 
         default:

+#if wxUSE_UNICODE
+            if ( event.GetUnicodeKey() )
+            {
+                ch = event.GetUnicodeKey();
+            }
+            else
+#endif

             if ( keycode < 256 && keycode >= 0 && wxIsprint(keycode) )
             {
                 // FIXME this is not going to work for non letters...
             if ( keycode < 256 && keycode >= 0 && wxIsprint(keycode) )
             {
                 // FIXME this is not going to work for non letters...


@@ -443,10 +433,10 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
     {
         WriteText(ch);
 
     {
         WriteText(ch);
 

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 #endif // !__WIN32__
 
 }
 #endif // !__WIN32__
 


@@ -483,12 +473,12 @@ void wxTextCtrlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
 {
     if ( event.GetSetEnabled() )
         Enable(event.GetEnabled());
 {
     if ( event.GetSetEnabled() )
         Enable(event.GetEnabled());

-    
+

     if ( event.GetSetText() )
     {
         if ( event.GetText() != GetValue() )
             SetValue(event.GetText());
     if ( event.GetSetText() )
     {
         if ( event.GetText() != GetValue() )
             SetValue(event.GetText());

-    }    
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -529,4 +519,3 @@ wxTextCtrlBase::HitTest(const wxPoint& WXUNUSED(pt),
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED)
 
 #endif // wxUSE_TEXTCTRL/!wxUSE_TEXTCTRL
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED)
 
 #endif // wxUSE_TEXTCTRL/!wxUSE_TEXTCTRL

-