// Modified by:
// Created: 13.07.99
// RCS-ID: $Id$
-// Copyright: (c) wxWindows team
+// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// declarations
// ============================================================================
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "textctrlbase.h"
#endif
{
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_textAlignment = wxTEXT_ALIGNMENT_DEFAULT;
m_flags = 0;
m_leftIndent = 0;
+ m_leftSubIndent = 0;
m_rightIndent = 0;
}
newAttr.SetTabs(attrDef.GetTabs());
if (attr.HasLeftIndent())
- newAttr.SetLeftIndent(attr.GetLeftIndent());
+ newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent());
else if (attrDef.HasLeftIndent())
- newAttr.SetLeftIndent(attrDef.GetLeftIndent());
+ newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent());
if (attr.HasRightIndent())
newAttr.SetRightIndent(attr.GetRightIndent());
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;
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."));
}
#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();
- m_filename = filename;
+ // if it worked, save for future calls
+ m_filename = filenameToUse;
return TRUE;
}
+#endif // wxUSE_FFILE
wxLogError(_("The text couldn't be saved."));
-#endif // wxUSE_FFILE
return FALSE;
}
// 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)
{
- // the generic version is unused in wxMSW
-#ifndef __WIN32__
wxChar ch = 0;
int keycode = event.GetKeyCode();
switch ( keycode )
return TRUE;
}
-#else
- event;
-#endif // !__WIN32__
return FALSE;
}
+#endif // !__WIN32__
// ----------------------------------------------------------------------------
// selection and ranges
}
}
+// ----------------------------------------------------------------------------
+// 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