Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv12906/src/gui
Modified Files:
wxBrowseButton.cpp wxFolderView.cpp wxIconManager.cpp
wxMApp.cpp wxMDialogs.cpp
Log Message:
compilation fixes for WXWIN_COMPATIBLITY_2_2 == 0
Index: wxBrowseButton.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxBrowseButton.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -b -u -2 -r1.28 -r1.29
--- wxBrowseButton.cpp 8 Sep 2002 19:23:09 -0000 1.28
+++ wxBrowseButton.cpp 6 Nov 2002 00:28:24 -0000 1.29
@@ -458,5 +458,5 @@
if ( (w1 != w2) || (h1 != h2) )
{
- bmp = wxImage(bmp).Rescale(w1, h1).ConvertToBitmap();
+ bmp = wxBitmap(bmp.ConvertToImage().Rescale(w1, h1));
}
//else: the size is already correct
@@ -482,7 +482,7 @@
{
// must resize the icon
- wxImage image(bmp);
+ wxImage image(bmp.ConvertToImage());
image.Rescale(size, size);
- bmp = image.ConvertToBitmap();
+ bmp = wxBitmap(image);
}
Index: wxFolderView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderView.cpp,v
retrieving revision 1.611
retrieving revision 1.612
diff -b -u -2 -r1.611 -r1.612
--- wxFolderView.cpp 6 Nov 2002 00:11:46 -0000 1.611
+++ wxFolderView.cpp 6 Nov 2002 00:28:24 -0000 1.612
@@ -2013,5 +2013,5 @@
mApplication->UpdateAwayMode();
- switch ( event.GetCode() )
+ switch ( event.GetKeyCode() )
{
case WXK_UP:
Index: wxIconManager.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxIconManager.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -b -u -2 -r1.91 -r1.92
--- wxIconManager.cpp 13 Oct 2002 12:24:53 -0000 1.91
+++ wxIconManager.cpp 6 Nov 2002 00:28:24 -0000 1.92
@@ -281,5 +281,5 @@
if(cpptr)
{
- *img = wxImage(cpptr);
+ *img = wxBitmap(cpptr).ConvertToImage();
wxIconManager::FreeImage(cpptr);
loaded = true;
Index: wxMApp.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMApp.cpp,v
retrieving revision 1.252
retrieving revision 1.253
diff -b -u -2 -r1.252 -r1.253
--- wxMApp.cpp 14 Sep 2002 23:11:18 -0000 1.252
+++ wxMApp.cpp 6 Nov 2002 00:28:24 -0000 1.253
@@ -1598,9 +1598,4 @@
// Set our icons for the dialogs.
- // This might happen during program shutdown, when the profile has
- // already been deleted or at startup before it is set up.
- if(! GetProfile() || GetGlobalDir().Length() == 0)
- return wxApp::GetStdIcon(which);
-
// this ugly "#ifdefs" are needed to silent warning about "switch without
// any case" warning under Windows
@@ -1616,10 +1611,8 @@
case wxICON_INFORMATION:
return ICON("msg_info"); break;
- default:
- return wxApp::GetStdIcon(which);
}
-#else
- return wxApp::GetStdIcon(which);
#endif
+
+ return wxNullIcon;
}
Index: wxMDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMDialogs.cpp,v
retrieving revision 1.383
retrieving revision 1.384
diff -b -u -2 -r1.383 -r1.384
--- wxMDialogs.cpp 19 Oct 2002 14:13:15 -0000 1.383
+++ wxMDialogs.cpp 6 Nov 2002 00:28:24 -0000 1.384
@@ -1879,8 +1879,8 @@
bool success = FALSE;
if(wxFileExists(filename))
- bmp = XFace::GetXFaceImg(filename, &success, m_Parent).ConvertToBitmap();
+ bmp = wxBitmap(XFace::GetXFaceImg(filename, &success, m_Parent));
if(! success)
{
- bmp = wxBitmap(wxTheApp->GetStdIcon(wxICON_HAND));
+ bmp = wxBitmap(((wxMApp *)mApplication)->GetStdIcon(wxICON_HAND));
m_XFace = "";
}
-------------------------------------------------------
This sf.net email is sponsored by: See the NEW Palm
Tungsten T handheld. Power & Color in a compact size!
http://ads.sourceforge.net/cgi-bin/redirect.pl?palm0001en
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
