[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Fixes initialisation of overview windo...

[<hug...@li...>]

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/d621d594d74f
changeset: 5104:d621d594d74f
user:      tmodes
date:       Sun Mar 13 15:26:41 2011 +0100
description:
Fixes initialisation of overview window on Mac [731734]

diffstat:

 src/hugin1/hugin/GLPreviewFrame.cpp |  4 ++--
 src/hugin1/hugin/MainFrame.cpp      |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r fc2731178ac1 -r d621d594d74f src/hugin1/hugin/GLPreviewFrame.cpp
--- a/src/hugin1/hugin/GLPreviewFrame.cpp	Sun Mar 13 09:14:18 2011 +0100
+++ b/src/hugin1/hugin/GLPreviewFrame.cpp	Sun Mar 13 15:26:41 2011 +0100
@@ -674,7 +674,7 @@
 
     if (config->Read(wxT("/GLPreviewFrame/isShown"), 0l) != 0)
     {
-#ifdef __WXMSW__
+#if defined __WXMSW__ || defined __WXMAC__
         InitPreviews();
         Show();
 #else
@@ -1217,7 +1217,7 @@
             m_mgr->Update();
         } else if (!(inf.IsShown() && toggle_on)) {
             inf.Show();
-#ifdef __WXMSW__
+#if defined __WXMSW__ || defined __WXMAC__
             m_GLOverview->SetActive(true);
             m_mgr->Update();
 #else
diff -r fc2731178ac1 -r d621d594d74f src/hugin1/hugin/MainFrame.cpp
--- a/src/hugin1/hugin/MainFrame.cpp	Sun Mar 13 09:14:18 2011 +0100
+++ b/src/hugin1/hugin/MainFrame.cpp	Sun Mar 13 15:26:41 2011 +0100
@@ -1319,21 +1319,21 @@
 
 void MainFrame::OnToggleGLPreviewFrame(wxCommandEvent & e)
 {
-#ifdef __WXMSW__
+#if defined __WXMSW__ || defined __WXMAC__
     gl_preview_frame->InitPreviews();
 #endif
     if (gl_preview_frame->IsIconized()) {
         gl_preview_frame->Iconize(false);
     }
     gl_preview_frame->Show();
-#ifdef __WXMSW__
+#if defined __WXMSW__
     // on wxMSW Show() does not send OnShowEvent needed to update the 
     // visibility state of the fast preview windows
     // so explicit calling this event handler
     wxShowEvent se;
     se.SetShow(true);
     gl_preview_frame->OnShowEvent(se);
-#else
+#elif defined __WXGTK__
     gl_preview_frame->LoadOpenGLLayout();
 #endif
     gl_preview_frame->Raise();