m_fontStyle = wxFONTSTYLE_NORMAL;
m_fontWeight = wxFONTWEIGHT_NORMAL;
m_fontUnderlined = false;
+ m_fontStrikethrough = false;
m_fontEncoding = wxFONTENCODING_DEFAULT;
m_fontFamily = wxFONTFAMILY_DEFAULT;
m_fontStyle = attr.m_fontStyle;
m_fontWeight = attr.m_fontWeight;
m_fontUnderlined = attr.m_fontUnderlined;
+ m_fontStrikethrough = attr.m_fontStrikethrough;
m_fontFaceName = attr.m_fontFaceName;
m_fontEncoding = attr.m_fontEncoding;
m_fontFamily = attr.m_fontFamily;
}
// Partial equality test. Only returns false if an attribute doesn't match.
-bool wxTextAttr::EqPartial(const wxTextAttr& attr) const
+bool wxTextAttr::EqPartial(const wxTextAttr& attr, bool weakTest) const
{
int flags = attr.GetFlags();
-
- if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && GetTextColour() != attr.GetTextColour())
+
+ if (!weakTest &&
+ ((!HasTextColour() && attr.HasTextColour()) ||
+ (!HasBackgroundColour() && attr.HasBackgroundColour()) ||
+ (!HasFontFaceName() && attr.HasFontFaceName()) ||
+ (!HasFontSize() && attr.HasFontSize()) ||
+ (!HasFontWeight() && attr.HasFontWeight()) ||
+ (!HasFontItalic() && attr.HasFontItalic()) ||
+ (!HasFontUnderlined() && attr.HasFontUnderlined()) ||
+ (!HasFontStrikethrough() && attr.HasFontStrikethrough()) ||
+ (!HasFontEncoding() && attr.HasFontEncoding()) ||
+ (!HasFontFamily() && attr.HasFontFamily()) ||
+ (!HasURL() && attr.HasURL()) ||
+ (!HasAlignment() && attr.HasAlignment()) ||
+ (!HasLeftIndent() && attr.HasLeftIndent()) ||
+ (!HasParagraphSpacingAfter() && attr.HasParagraphSpacingAfter()) ||
+ (!HasParagraphSpacingBefore() && attr.HasParagraphSpacingBefore()) ||
+ (!HasLineSpacing() && attr.HasLineSpacing()) ||
+ (!HasCharacterStyleName() && attr.HasCharacterStyleName()) ||
+ (!HasParagraphStyleName() && attr.HasParagraphStyleName()) ||
+ (!HasListStyleName() && attr.HasListStyleName()) ||
+ (!HasBulletStyle() && attr.HasBulletStyle()) ||
+ (!HasBulletNumber() && attr.HasBulletNumber()) ||
+ (!HasBulletText() && attr.HasBulletText()) ||
+ (!HasBulletName() && attr.HasBulletName()) ||
+ (!HasTabs() && attr.HasTabs()) ||
+ (!HasTextEffects() && attr.HasTextEffects()) ||
+ (!HasOutlineLevel() && attr.HasOutlineLevel())))
+ {
+ return false;
+ }
+
+ if (HasTextColour() && attr.HasTextColour() && GetTextColour() != attr.GetTextColour())
+ return false;
+
+ if (HasBackgroundColour() && attr.HasBackgroundColour() && GetBackgroundColour() != attr.GetBackgroundColour())
+ return false;
+
+ if (HasFontFaceName() && attr.HasFontFaceName() && GetFontFaceName() != attr.GetFontFaceName())
return false;
- if ((flags & wxTEXT_ATTR_BACKGROUND_COLOUR) && GetBackgroundColour() != attr.GetBackgroundColour())
+ // This checks whether the two objects have the same font size dimension (px versus pt)
+ if (HasFontSize() && attr.HasFontSize() && (flags & wxTEXT_ATTR_FONT) != (GetFlags() & wxTEXT_ATTR_FONT))
return false;
- if ((flags & wxTEXT_ATTR_FONT_FACE) &&
- GetFontFaceName() != attr.GetFontFaceName())
+ if (HasFontPointSize() && attr.HasFontPointSize() && GetFontSize() != attr.GetFontSize())
return false;
- if ((flags & wxTEXT_ATTR_FONT_SIZE) &&
- GetFontSize() != attr.GetFontSize())
+ if (HasFontPixelSize() && attr.HasFontPixelSize() && GetFontSize() != attr.GetFontSize())
return false;
- if ((flags & wxTEXT_ATTR_FONT_WEIGHT) &&
- GetFontWeight() != attr.GetFontWeight())
+ if (HasFontWeight() && attr.HasFontWeight() && GetFontWeight() != attr.GetFontWeight())
return false;
- if ((flags & wxTEXT_ATTR_FONT_ITALIC) &&
- GetFontStyle() != attr.GetFontStyle())
+ if (HasFontItalic() && attr.HasFontItalic() && GetFontStyle() != attr.GetFontStyle())
return false;
- if ((flags & wxTEXT_ATTR_FONT_UNDERLINE) &&
- GetFontUnderlined() != attr.GetFontUnderlined())
+ if (HasFontUnderlined() && attr.HasFontUnderlined() && GetFontUnderlined() != attr.GetFontUnderlined())
return false;
- if ((flags & wxTEXT_ATTR_FONT_ENCODING) &&
- GetFontEncoding() != attr.GetFontEncoding())
+ if (HasFontStrikethrough() && attr.HasFontStrikethrough() && GetFontStrikethrough() != attr.GetFontStrikethrough())
return false;
- if ((flags & wxTEXT_ATTR_FONT_FAMILY) &&
- GetFontFamily() != attr.GetFontFamily())
+ if (HasFontEncoding() && attr.HasFontEncoding() && GetFontEncoding() != attr.GetFontEncoding())
return false;
- if ((flags & wxTEXT_ATTR_URL) && GetURL() != attr.GetURL())
+ if (HasFontFamily() && attr.HasFontFamily() && GetFontFamily() != attr.GetFontFamily())
return false;
- if ((flags & wxTEXT_ATTR_ALIGNMENT) && GetAlignment() != attr.GetAlignment())
+ if (HasURL() && attr.HasURL() && GetURL() != attr.GetURL())
return false;
- if ((flags & wxTEXT_ATTR_LEFT_INDENT) &&
+ if (HasAlignment() && attr.HasAlignment() && GetAlignment() != attr.GetAlignment())
+ return false;
+
+ if (HasLeftIndent() && attr.HasLeftIndent() &&
((GetLeftIndent() != attr.GetLeftIndent()) || (GetLeftSubIndent() != attr.GetLeftSubIndent())))
return false;
- if ((flags & wxTEXT_ATTR_RIGHT_INDENT) &&
- (GetRightIndent() != attr.GetRightIndent()))
+ if (HasRightIndent() && attr.HasRightIndent() && (GetRightIndent() != attr.GetRightIndent()))
return false;
- if ((flags & wxTEXT_ATTR_PARA_SPACING_AFTER) &&
+ if (HasParagraphSpacingAfter() && attr.HasParagraphSpacingAfter() &&
(GetParagraphSpacingAfter() != attr.GetParagraphSpacingAfter()))
return false;
- if ((flags & wxTEXT_ATTR_PARA_SPACING_BEFORE) &&
+ if (HasParagraphSpacingBefore() && attr.HasParagraphSpacingBefore() &&
(GetParagraphSpacingBefore() != attr.GetParagraphSpacingBefore()))
return false;
- if ((flags & wxTEXT_ATTR_LINE_SPACING) &&
- (GetLineSpacing() != attr.GetLineSpacing()))
+ if (HasLineSpacing() && attr.HasLineSpacing() && (GetLineSpacing() != attr.GetLineSpacing()))
return false;
- if ((flags & wxTEXT_ATTR_CHARACTER_STYLE_NAME) &&
- (GetCharacterStyleName() != attr.GetCharacterStyleName()))
+ if (HasCharacterStyleName() && attr.HasCharacterStyleName() && (GetCharacterStyleName() != attr.GetCharacterStyleName()))
return false;
- if ((flags & wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) &&
- (GetParagraphStyleName() != attr.GetParagraphStyleName()))
+ if (HasParagraphStyleName() && attr.HasParagraphStyleName() && (GetParagraphStyleName() != attr.GetParagraphStyleName()))
return false;
- if ((flags & wxTEXT_ATTR_LIST_STYLE_NAME) &&
- (GetListStyleName() != attr.GetListStyleName()))
+ if (HasListStyleName() && attr.HasListStyleName() && (GetListStyleName() != attr.GetListStyleName()))
return false;
- if ((flags & wxTEXT_ATTR_BULLET_STYLE) &&
- (GetBulletStyle() != attr.GetBulletStyle()))
+ if (HasBulletStyle() && attr.HasBulletStyle() && (GetBulletStyle() != attr.GetBulletStyle()))
return false;
- if ((flags & wxTEXT_ATTR_BULLET_NUMBER) &&
- (GetBulletNumber() != attr.GetBulletNumber()))
+ if (HasBulletNumber() && attr.HasBulletNumber() && (GetBulletNumber() != attr.GetBulletNumber()))
return false;
- if ((flags & wxTEXT_ATTR_BULLET_TEXT) &&
+ if (HasBulletText() && attr.HasBulletText() &&
(GetBulletText() != attr.GetBulletText()) &&
(GetBulletFont() != attr.GetBulletFont()))
return false;
- if ((flags & wxTEXT_ATTR_BULLET_NAME) &&
- (GetBulletName() != attr.GetBulletName()))
+ if (HasBulletName() && attr.HasBulletName() && (GetBulletName() != attr.GetBulletName()))
return false;
- if ((flags & wxTEXT_ATTR_TABS) &&
- !TabsEq(GetTabs(), attr.GetTabs()))
+ if (HasTabs() && attr.HasTabs() && !TabsEq(GetTabs(), attr.GetTabs()))
return false;
- if ((flags & wxTEXT_ATTR_PAGE_BREAK) &&
- (HasPageBreak() != attr.HasPageBreak()))
+ if ((HasPageBreak() != attr.HasPageBreak()))
return false;
- if (flags & wxTEXT_ATTR_EFFECTS)
+ if (HasTextEffects() && attr.HasTextEffects())
{
- if (HasTextEffects() != attr.HasTextEffects())
- return false;
if (!BitlistsEqPartial(GetTextEffects(), attr.GetTextEffects(), attr.GetTextEffectFlags()))
return false;
}
- if ((flags & wxTEXT_ATTR_OUTLINE_LEVEL) &&
- (GetOutlineLevel() != attr.GetOutlineLevel()))
+ if (HasOutlineLevel() && attr.HasOutlineLevel() && (GetOutlineLevel() != attr.GetOutlineLevel()))
return false;
return true;
if (HasFontSize())
fontSize = GetFontSize();
- int fontStyle = wxNORMAL;
+ wxFontStyle fontStyle = wxFONTSTYLE_NORMAL;
if (HasFontItalic())
fontStyle = GetFontStyle();
- int fontWeight = wxNORMAL;
+ wxFontWeight fontWeight = wxFONTWEIGHT_NORMAL;
if (HasFontWeight())
fontWeight = GetFontWeight();
if (HasFontUnderlined())
underlined = GetFontUnderlined();
+ bool strikethrough = false;
+ if (HasFontStrikethrough())
+ strikethrough = GetFontStrikethrough();
+
wxString fontFaceName;
if (HasFontFaceName())
fontFaceName = GetFontFaceName();
if (HasFontFamily())
fontFamily = GetFontFamily();
- wxFont font(fontSize, fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding);
- return font;
+ if (HasFontPixelSize())
+ {
+ wxFont font(wxSize(0, fontSize), fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding);
+ if (strikethrough)
+ font.SetStrikethrough(true);
+ return font;
+ }
+ else
+ {
+ wxFont font(fontSize, fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding);
+ if (strikethrough)
+ font.SetStrikethrough(true);
+ return font;
+ }
}
// Get attributes from font.
if (!font.IsOk())
return false;
- if (flags & wxTEXT_ATTR_FONT_SIZE)
+ // If we pass both pixel and point size attributes, this is an indication
+ // to choose the most appropriate units.
+ if ((flags & wxTEXT_ATTR_FONT) == wxTEXT_ATTR_FONT)
+ {
+ if (font.IsUsingSizeInPixels())
+ {
+ m_fontSize = font.GetPixelSize().y;
+ flags &= ~wxTEXT_ATTR_FONT_POINT_SIZE;
+ }
+ else
+ {
+ m_fontSize = font.GetPointSize();
+ flags &= ~wxTEXT_ATTR_FONT_PIXEL_SIZE;
+ }
+ }
+ else if (flags & wxTEXT_ATTR_FONT_POINT_SIZE)
+ {
m_fontSize = font.GetPointSize();
+ flags &= ~wxTEXT_ATTR_FONT_PIXEL_SIZE;
+ }
+ else if (flags & wxTEXT_ATTR_FONT_PIXEL_SIZE)
+ {
+ m_fontSize = font.GetPixelSize().y;
+ }
if (flags & wxTEXT_ATTR_FONT_ITALIC)
m_fontStyle = font.GetStyle();
if (flags & wxTEXT_ATTR_FONT_UNDERLINE)
m_fontUnderlined = font.GetUnderlined();
+ if (flags & wxTEXT_ATTR_FONT_STRIKETHROUGH)
+ m_fontStrikethrough = font.GetStrikethrough();
+
if (flags & wxTEXT_ATTR_FONT_FACE)
m_fontFaceName = font.GetFaceName();
destStyle.SetFontWeight(style.GetFontWeight());
}
- if (style.HasFontSize())
+ if (style.HasFontPointSize())
+ {
+ if (!(compareWith && compareWith->HasFontPointSize() && compareWith->GetFontSize() == style.GetFontSize()))
+ destStyle.SetFontPointSize(style.GetFontSize());
+ }
+ else if (style.HasFontPixelSize())
{
- if (!(compareWith && compareWith->HasFontSize() && compareWith->GetFontSize() == style.GetFontSize()))
- destStyle.SetFontSize(style.GetFontSize());
+ if (!(compareWith && compareWith->HasFontPixelSize() && compareWith->GetFontSize() == style.GetFontSize()))
+ destStyle.SetFontPixelSize(style.GetFontSize());
}
if (style.HasFontItalic())
destStyle.SetFontUnderlined(style.GetFontUnderlined());
}
+ if (style.HasFontStrikethrough())
+ {
+ if (!(compareWith && compareWith->HasFontStrikethrough() && compareWith->GetFontStrikethrough() == style.GetFontStrikethrough()))
+ destStyle.SetFontStrikethrough(style.GetFontStrikethrough());
+ }
+
if (style.HasFontFaceName())
{
if (!(compareWith && compareWith->HasFontFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName()))
{
int relevantBitsA = valueA & flags;
int relevantBitsB = valueB & flags;
- return (relevantBitsA != relevantBitsB);
+ return relevantBitsA == relevantBitsB;
}
/// Split into paragraph and character styles
{
SetValue(text);
+ DiscardEdits();
+ m_filename = filename;
+
return true;
}
}
#endif // wxUSE_FFILE
+ wxLogError(_("File couldn't be loaded."));
+
return false;
}
-bool wxTextCtrlBase::DoLoadFile(const wxString& filename, int fileType)
+bool wxTextAreaBase::DoSaveFile(const wxString& filename, int WXUNUSED(fileType))
{
- if ( wxTextAreaBase::DoLoadFile(filename, fileType) )
+#if wxUSE_FFILE
+ wxFFile file(filename, wxT("w"));
+ if ( file.IsOpened() && file.Write(GetValue(), *wxConvCurrent) )
{
- DiscardEdits();
+ // if it worked, save for future calls
m_filename = filename;
+
+ // it's not modified any longer
+ DiscardEdits();
+
return true;
}
- wxLogError(_("File couldn't be loaded."));
- return false;
-}
+#endif // wxUSE_FFILE
-bool wxTextAreaBase::DoSaveFile(const wxString& filename, int WXUNUSED(fileType))
-{
-#if wxUSE_FFILE
- wxFFile file(filename, wxT("w"));
- return file.IsOpened() && file.Write(GetValue(), *wxConvCurrent);
-#else
return false;
-#endif // wxUSE_FFILE
}
bool wxTextAreaBase::SaveFile(const wxString& filename, int fileType)
return DoSaveFile(filenameToUse, fileType);
}
-bool wxTextCtrlBase::DoSaveFile(const wxString& filename, int fileType)
-{
- if ( wxTextAreaBase::DoSaveFile(filename, fileType) )
- {
- // if it worked, save for future calls
- m_filename = filename;
-
- // it's not modified any longer
- DiscardEdits();
-
- return true;
- }
- return false;
-}
-
// ----------------------------------------------------------------------------
// stream-like insertion operator
// ----------------------------------------------------------------------------
bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
{
+ bool handled = false;
// we have a native implementation for Win32 and so don't need this one
#ifndef __WIN32__
wxChar ch = 0;
int keycode = event.GetKeyCode();
+
+ long from, to;
+ GetSelection(&from,&to);
+ long insert = GetInsertionPoint();
+ long last = GetLastPosition();
+
+ // catch arrow left and right
+
switch ( keycode )
{
+ case WXK_LEFT:
+ if ( event.ShiftDown() )
+ SetSelection( (from > 0 ? from - 1 : 0) , to );
+ else
+ {
+ if ( from != to )
+ insert = from;
+ else if ( insert > 0 )
+ insert -= 1;
+ SetInsertionPoint( insert );
+ }
+ handled = true;
+ break;
+ case WXK_RIGHT:
+ if ( event.ShiftDown() )
+ SetSelection( from, (to < last ? to + 1 : last) );
+ else
+ {
+ if ( from != to )
+ insert = to;
+ else if ( insert < last )
+ insert += 1;
+ SetInsertionPoint( insert );
+ }
+ handled = true;
+ break;
case WXK_NUMPAD0:
case WXK_NUMPAD1:
case WXK_NUMPAD2:
const long pos = GetInsertionPoint();
if ( pos < GetLastPosition() )
Remove(pos, pos + 1);
+ handled = true;
}
break;
const long pos = GetInsertionPoint();
if ( pos > 0 )
Remove(pos - 1, pos);
+ handled = true;
}
break;
{
WriteText(ch);
- return true;
+ handled = true;
}
#else // __WIN32__
wxUnusedVar(event);
#endif // !__WIN32__/__WIN32__
- return false;
+ return handled;
+}
+
+// ----------------------------------------------------------------------------
+// Other miscellaneous stuff
+// ----------------------------------------------------------------------------
+
+bool wxTextCtrlBase::SetHint(const wxString& hint)
+{
+ wxCHECK_MSG( IsSingleLine(), false,
+ wxS("Hints can only be set for single line text controls") );
+
+ return wxTextEntry::SetHint(hint);
}
// do the window-specific processing after processing the update event
projects / wxWidgets.git / blobdiff