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

fix compilation with --disable-compat-22 (patch 759563)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-09 23:22:46 +00:00
parent 5e4196efab
commit ebacdfcde4
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.txt
View File

@@ -195,6 +195,10 @@ Unix:
- added --basename and --release flags to wx-config (Robert O'Connor) - added --basename and --release flags to wx-config (Robert O'Connor)
- added support for GNU/Hurd in configure - added support for GNU/Hurd in configure
wxGTK
- fixed compilation with --disable-compat-22
wxMSW: wxMSW:
- compilation fix for VC++ command line build (missing version.mak) - compilation fix for VC++ command line build (missing version.mak)

6
src/gtk/menu.cpp
View File

@@ -1268,7 +1268,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
case wxITEM_NORMAL: case wxITEM_NORMAL:
item_type = "<Item>"; item_type = "<Item>";
#ifdef __WXGTK20__ #if defined(__WXGTK20__) && wxUSE_IMAGE
if (mitem->GetBitmap().Ok()) if (mitem->GetBitmap().Ok())
{ {
item_type = "<ImageItem>"; item_type = "<ImageItem>";
@@ -1276,7 +1276,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
// get a GdkPixbuf structure, which we need to create on the fly. // get a GdkPixbuf structure, which we need to create on the fly.
// This Pixbuf structure needs to be static so we create it and // This Pixbuf structure needs to be static so we create it and
// just make it a memory leak... // just make it a memory leak...
wxImage image( mitem->GetBitmap() ); wxImage image( mitem->GetBitmap().ConvertToImage() );
size_t size = 4 + // magic size_t size = 4 + // magic
20 + // header 20 + // header
image.GetHeight() * image.GetWidth() * 4; // RGBA image.GetHeight() * image.GetWidth() * 4; // RGBA
@@ -1324,7 +1324,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
} }
break; break;
} }
#endif #endif // GTK 2.0+
break; break;
} }

6
src/gtk1/menu.cpp
View File

@@ -1268,7 +1268,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
case wxITEM_NORMAL: case wxITEM_NORMAL:
item_type = "<Item>"; item_type = "<Item>";
#ifdef __WXGTK20__ #if defined(__WXGTK20__) && wxUSE_IMAGE
if (mitem->GetBitmap().Ok()) if (mitem->GetBitmap().Ok())
{ {
item_type = "<ImageItem>"; item_type = "<ImageItem>";
@@ -1276,7 +1276,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
// get a GdkPixbuf structure, which we need to create on the fly. // get a GdkPixbuf structure, which we need to create on the fly.
// This Pixbuf structure needs to be static so we create it and // This Pixbuf structure needs to be static so we create it and
// just make it a memory leak... // just make it a memory leak...
wxImage image( mitem->GetBitmap() ); wxImage image( mitem->GetBitmap().ConvertToImage() );
size_t size = 4 + // magic size_t size = 4 + // magic
20 + // header 20 + // header
image.GetHeight() * image.GetWidth() * 4; // RGBA image.GetHeight() * image.GetWidth() * 4; // RGBA
@@ -1324,7 +1324,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
} }
break; break;
} }
#endif #endif // GTK 2.0+
break; break;
} }