[Hugin-cvs] hugin/src/hugin CPListFrame.cpp,1.22,1.23 MainFrame.cpp,1.160,1.161 NonaStitcherPanel.cpp,1.52,1.53 PreferencesDialog.cpp,1.33,1.34 PreviewFrame.cpp,1.53,1.54

[Pablo d'A. <da...@us...>]

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27512

Modified Files:
	CPListFrame.cpp MainFrame.cpp NonaStitcherPanel.cpp 
	PreferencesDialog.cpp PreviewFrame.cpp 
Log Message:
Display meaningful message when nona is out of memory.
Fixed wxFrame background color on wxMSW. 


Index: MainFrame.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/MainFrame.cpp,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- MainFrame.cpp	11 Aug 2005 17:42:15 -0000	1.160
+++ MainFrame.cpp	16 Aug 2005 20:43:33 -0000	1.161
@@ -365,11 +365,15 @@
     }
     wxYield();
 	
-
     // disable automatic Layout() calls, to it by hand
     SetAutoLayout(false);
 
 
+#if __WXMSW__
+    // wxFrame does have a strange background color on Windows, copy color from a child widget
+    this->SetBackgroundColour(images_panel->GetBackgroundColour());
+#endif
+
 // By using /SUBSYSTEM:CONSOLE /ENTRY:"WinMainCRTStartup" in the linker
 // options for the debug build, a console window will be used for stdout
 // and stderr. No need to redirect to a file. Better security since we can't

Index: PreferencesDialog.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/PreferencesDialog.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- PreferencesDialog.cpp	15 Aug 2005 21:38:57 -0000	1.33
+++ PreferencesDialog.cpp	16 Aug 2005 20:43:33 -0000	1.34
@@ -118,6 +118,11 @@
     // Load configuration values from wxConfig
     UpdateDisplayData();
 
+#if __WXMSW__
+    // wxFrame does have a strange background color on Windows, copy color from a child widget
+    this->SetBackgroundColour(XRCCTRL(*this, "prefs_ft_RotationStartAngle", wxSpinCtrl)->GetBackgroundColour());
+#endif
+
     RestoreFramePosition(this, wxT("PreferencesDialog"));
 }
 

Index: NonaStitcherPanel.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/NonaStitcherPanel.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- NonaStitcherPanel.cpp	15 Aug 2005 17:07:28 -0000	1.52
+++ NonaStitcherPanel.cpp	16 Aug 2005 20:43:33 -0000	1.53
@@ -291,8 +291,15 @@
         // stitch panorama
         PT::stitchPanorama(pano, opts,
                            pdisp, opts.outfile, imgs);
+    } catch (std::bad_alloc & e) {
+        wxMessageBox(_("Out of memory.\nTry again with a smaller panorama image size\n"),
+                     _("Error during stitching"),
+                     wxICON_ERROR | wxOK);
+        return;
     } catch (std::exception & e) {
-        DEBUG_FATAL(_("error during stitching:") << e.what());
+        wxMessageBox(wxString(e.what(), *wxConvCurrent),
+                     _("Error during stitching"),
+                     wxICON_ERROR | wxOK);
         return;
     }
 

Index: PreviewFrame.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/PreviewFrame.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- PreviewFrame.cpp	11 Aug 2005 17:42:15 -0000	1.53
+++ PreviewFrame.cpp	16 Aug 2005 20:43:33 -0000	1.54
@@ -200,7 +200,7 @@
     SetStatusText(wxT(""),1);
 
     // the initial size as calculated by the sizers
-    SetSizer( topsizer );
+    this->SetSizer( topsizer );
     topsizer->SetSizeHints( this );
 
     // set the minimize icon
@@ -222,6 +222,11 @@
 
     m_ToolBar->ToggleTool(XRCID("preview_auto_update_tool"), aup !=0);
 
+#if __WXMSW_
+    // wxFrame does have a strange background color on Windows..
+    this->SetBackgroundColour(m_PreviewPanel->GetBackgroundColour());
+#endif
+
     if (config->Read(wxT("/PreviewFrame/isShown"), 0l) != 0) {
         Show();
     }

Index: CPListFrame.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/CPListFrame.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- CPListFrame.cpp	11 Aug 2005 17:42:15 -0000	1.22
+++ CPListFrame.cpp	16 Aug 2005 20:43:33 -0000	1.23
@@ -267,6 +267,10 @@
     m_verbose = (config->Read(wxT("/CPListFrame/verbose"),0l) != 0);
 
 #if __WXMSW__
+    // wxFrame does have a strange background color on Windows, copy color from a child widget
+    this->SetBackgroundColour(XRCCTRL(*this, "cp_list_select", wxButton)->GetBackgroundColour());
+#endif
+#if __WXMSW__
     wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO);
 #else
     wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG);