fixed setting of initial font under wxGTK2

[wxWidgets.git] / src / gtk1 / bitmap.cpp

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 38a044b1aa640f50f1cf9e1a439a211a08231de5..de3d7c1f67d9cabe7d2a61c6206deb7d8a305442 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -415,7 +415,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
     {
         char outbyte = 0;
         int old_x = -1;
     {
         char outbyte = 0;
         int old_x = -1;

-        guint32 old_pixval;
+        guint32 old_pixval = 0;

 
         for (int w = 0; w < width; w++)
         {
 
         for (int w = 0; w < width; w++)
         {


@@ -480,7 +480,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
         {
             char outbyte = 0;
             int old_x = -1;
         {
             char outbyte = 0;
             int old_x = -1;

-            guint32 old_pixval;
+            guint32 old_pixval = 0;

     
             for (int w = 0; w < width; w++)
             {
     
             for (int w = 0; w < width; w++)
             {


@@ -1079,7 +1079,7 @@ bool wxBitmap::operator != ( const wxBitmap& bmp ) const
 
 bool wxBitmap::Ok() const
 {
 
 bool wxBitmap::Ok() const
 {

-    return (m_refData != NULL);
+    return (m_refData != NULL) && (M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap);

 }
 
 int wxBitmap::GetHeight() const
 }
 
 int wxBitmap::GetHeight() const