fixed wxImage->wxBitmap conversion for images with alpha channel

[wxWidgets.git] / src / msw / frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 1ca248342e661b8e3ee169e84fe4491f04e7fee3..efc6a5c6305a3f3fe41b42aa0f95e6a108fa0d7b 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -190,11 +190,15 @@ bool wxFrame::Create(wxWindow *parent,
                      const wxString& name)
 {
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
-        return FALSE;
+        return false;
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
 
-    return TRUE;
+#ifdef __SMARTPHONE__
+    SetLeftMenu(wxID_EXIT, _("Done"));
+#endif
+
+    return true;
 }
 
 wxFrame::~wxFrame()
@@ -280,7 +284,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number,
                                         wxWindowID id,
                                         const wxString& name)
 {
-    wxStatusBar *statusBar = NULL;
+    wxStatusBar *statusBar wxDUMMY_INITIALIZE(NULL);
 
 #if wxUSE_NATIVE_STATUSBAR
     if ( !UsesNativeStatusBar() )
@@ -612,8 +616,8 @@ void wxFrame::PositionToolBar()
 
         // Optimise such that we don't have to always resize the toolbar
         // when the frame changes, otherwise we'll get a lot of flicker.        
-        bool heightChanging = TRUE;
-        bool widthChanging = TRUE;
+        bool heightChanging wxDUMMY_INITIALIZE(true);
+        bool widthChanging wxDUMMY_INITIALIZE(true);
         
         if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
         {