Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12065/src/gui
Modified Files:
wxComposeView.cpp wxFolderView.cpp
Log Message:
don't override default font by default (important for using the system font
under Unix, we can't really recreate it using wxFont ctor)
Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.413
retrieving revision 1.414
diff -b -u -2 -r1.413 -r1.414
--- wxComposeView.cpp 28 Jun 2006 15:55:15 -0000 1.413
+++ wxComposeView.cpp 19 Aug 2006 12:03:39 -0000 1.414
@@ -935,12 +935,4 @@
}
- if ( !font.Ok() )
- {
- font = wxFont(m_fontSize,
- m_fontFamily,
- wxFONTSTYLE_NORMAL,
- wxFONTWEIGHT_NORMAL);
- }
-
return font;
}
@@ -2289,5 +2281,7 @@
text->SetForegroundColour(m_options.m_fg);
text->SetBackgroundColour(m_options.m_bg);
- text->SetFont(m_options.GetFont());
+ wxFont font(m_options.GetFont());
+ if ( font.Ok() )
+ text->SetFont(font);
wxSizer *sizer = text->GetContainingSizer();
Index: wxFolderView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderView.cpp,v
retrieving revision 1.681
retrieving revision 1.682
diff -b -u -2 -r1.681 -r1.682
--- wxFolderView.cpp 19 Aug 2006 11:57:09 -0000 1.681
+++ wxFolderView.cpp 19 Aug 2006 12:03:39 -0000 1.682
@@ -1619,11 +1619,8 @@
}
- if ( !font.Ok() )
+ if ( font.Ok() )
{
- font = wxFont(fontSize, fontFamily,
- wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
- }
-
SetFont(font);
+ }
if ( memcmp(m_columns, columns, sizeof(m_columns)) != 0 )
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
