Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv18174/src/gui
Modified Files:
wxComposeView.cpp
Log Message:
GetTransparentBitmap() hack (due to using non-standard transparency colour in
toolbar bitmaps) is not needed any more
Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.409
retrieving revision 1.410
diff -b -u -2 -r1.409 -r1.410
--- wxComposeView.cpp 25 Jun 2006 22:25:12 -0000 1.409
+++ wxComposeView.cpp 26 Jun 2006 18:34:19 -0000 1.410
@@ -219,16 +219,4 @@
}
-// return a transparent bitmap
-static wxBitmap GetTransparentBitmap(const wxChar *name)
-{
- wxBitmap bmp = mApplication->GetIconManager()->GetBitmap(name);
-
-#ifdef OS_WIN
- bmp.SetMask(new wxMask(bmp, wxColour(0xc6, 0xc6, 0xc6)));
-#endif // OS_WIN
-
- return bmp;
-}
-
// ----------------------------------------------------------------------------
// private classes
@@ -509,6 +497,8 @@
m_isReply = m_composer->IsInReplyTo();
- SetBitmapLabel(GetTransparentBitmap(m_isReply ? _T("tb_mail_reply")
- : _T("tb_mail_new")));
+ SetBitmapLabel(mApplication->GetIconManager()->GetBitmap
+ (
+ m_isReply ? _T("tb_mail_reply") : _T("tb_mail_new")
+ ));
SetToolTip(m_isReply ? _("This is a reply to another message")
: _("This is a start of new thread"));
@@ -624,5 +614,6 @@
public:
wxRcptExpandButton(wxRcptControl *rcptControl, wxWindow *parent)
- : IconButton(parent, GetTransparentBitmap(_T("tb_lookup")))
+ : IconButton(parent,
+ mApplication->GetIconManager()->GetBitmap(_T("tb_lookup")))
{
m_rcptControl = rcptControl;
@@ -648,5 +639,6 @@
public:
wxRcptAddButton(wxRcptMainControl *rcptControl, wxWindow *parent)
- : IconButton(parent, GetTransparentBitmap(_T("tb_new")))
+ : IconButton(parent,
+ mApplication->GetIconManager()->GetBitmap(_T("tb_new")))
{
m_rcptControl = rcptControl;
@@ -677,5 +669,6 @@
public:
wxRcptRemoveButton(wxRcptExtraControl *rcptControl, wxWindow *parent)
- : IconButton(parent, GetTransparentBitmap(_T("tb_trash")))
+ : IconButton(parent,
+ mApplication->GetIconManager()->GetBitmap(_T("tb_trash")))
{
m_rcptControl = rcptControl;
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
