Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv28594/src/gui
Modified Files:
wxllist.cpp
Log Message:
fixed setting the font for the composer (bug 657)
Index: wxllist.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxllist.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -b -u -2 -r1.146 -r1.147
--- wxllist.cpp 14 Mar 2002 21:12:21 -0000 1.146
+++ wxllist.cpp 26 May 2002 23:31:59 -0000 1.147
@@ -533,9 +533,12 @@
}
-#define COPY_SI_(what) if(right.what != -1) what = right.what;
+#define COPY_SI_(what) if(other.what != -1) what = other.what;
wxLayoutStyleInfo &
-wxLayoutStyleInfo::operator=(const wxLayoutStyleInfo &right)
+wxLayoutStyleInfo::operator=(const wxLayoutStyleInfo &other)
{
+ if ( other.font.Ok() )
+ font = other.font;
+
COPY_SI_(family);
COPY_SI_(style);
@@ -544,6 +547,10 @@
COPY_SI_(underline);
COPY_SI_(enc);
- if(right.m_fg_valid) m_fg = right.m_fg;
- if(right.m_bg_valid) m_bg = right.m_bg;
+
+ if(other.m_fg_valid)
+ m_fg = other.m_fg;
+ if(other.m_bg_valid)
+ m_bg = other.m_bg;
+
return *this;
}
_______________________________________________________________
Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -- http://devcon.sprintpcs.com/adp/index.cfm
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
