Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added scrollbar size to settings

Browse Source 
Added tetsing for cursor keys to wxTextValidator
  Correcte misspelled colour in wxColourDialog
  Made print dialogs look nicer
  Made wxStatixBox transparent (in the middle) for mouse
    actions (very useful for DialogEd)
  Corrected colour setting in DialogEd not to set any colour
    when using standard colour
  Corretced unresponding scrollbar in DialogEd


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-12 16:42:43 +00:00
parent 44c4a33486
commit 1ecc4d808e
20 changed files with 1529 additions and 1477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/gtk1/font.cpp
View File

@@ -179,22 +179,14 @@ bool wxFont::Ok() const
int wxFont::GetPointSize() const
{
if (!Ok())
{
wxFAIL_MSG( "invalid font" );
return 0;
}
wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_pointSize;
}
wxString wxFont::GetFaceString() const
{
if (!Ok())
{
wxFAIL_MSG( "invalid font" );
return "";
}
wxCHECK_MSG( Ok(), "", "invalid font" );
wxString s = wxTheFontNameDirectory->GetFontName( M_FONTDATA->m_fontId );
return s;
@@ -202,11 +194,7 @@ wxString wxFont::GetFaceString() const
wxString wxFont::GetFaceName() const
{
if (!Ok())
{
wxFAIL_MSG( "invalid font" );
return "";
}
wxCHECK_MSG( Ok(), "", "invalid font" );
wxString s = wxTheFontNameDirectory->GetFontName( M_FONTDATA->m_fontId );
return s;
@@ -214,22 +202,14 @@ wxString wxFont::GetFaceName() const
int wxFont::GetFamily() const
{
if (!Ok())
{
wxFAIL_MSG( "invalid font" );
return 0;
}
wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_family;
}
wxString wxFont::GetFamilyString() const
{
if (!Ok())
{
wxFAIL_MSG( "invalid font" );
return "wxDEFAULT";
}
wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
switch (M_FONTDATA->m_family)
{
@@ -247,33 +227,21 @@ wxString wxFont::GetFamilyString() const
int wxFont::GetFontId() const
{
if (!Ok())
{
wxFAIL_MSG( "invalid font" );
return 0;
}
wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_fontId; // stub
}
int wxFont::GetStyle() const
{
if (!Ok())
{
wxFAIL_MSG( "invalid font" );
return 0;
}
wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_style;
}
wxString wxFont::GetStyleString() const
{
if (!Ok())
{
wxFAIL_MSG( "invalid font" );
return "wxDEFAULT";
}
wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
switch (M_FONTDATA->m_style)
{
@@ -288,22 +256,14 @@ wxString wxFont::GetStyleString() const
int wxFont::GetWeight() const
{
if (!Ok())
{
wxFAIL_MSG( "invalid font" );
return 0;
}
wxCHECK_MSG( Ok(), 0, "invalid font" );
return M_FONTDATA->m_weight;
}
wxString wxFont::GetWeightString() const
{
if (!Ok())
{
wxFAIL_MSG( "invalid font" );
return "wxDEFAULT";
}
wxCHECK_MSG( Ok(), "wxDEFAULT", "invalid font" );
switch (M_FONTDATA->m_weight)
{
@@ -318,11 +278,7 @@ wxString wxFont::GetWeightString() const
bool wxFont::GetUnderlined() const
{
if (!Ok())
{
wxFAIL_MSG( "invalid font" );
return FALSE;
}
wxCHECK_MSG( Ok(), FALSE, "invalid font" );
return M_FONTDATA->m_underlined;
}