synching down and up events for the synthetic right mouse handling

[wxWidgets.git] / utils / configtool / src / wxconfigtool.cpp

diff --git a/utils/configtool/src/wxconfigtool.cpp b/utils/configtool/src/wxconfigtool.cpp
index 8c68072f16fdd6b9ef5a9c5e9d03ffefb3b69be6..cd2f5af42fb785dd5748f50a6b180f94b81fb1ab 100644 (file)
--- a/utils/configtool/src/wxconfigtool.cpp
+++ b/utils/configtool/src/wxconfigtool.cpp
@@ -9,7 +9,7 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "wxconfigtool.h"
 #endif
 
@@ -25,6 +25,7 @@
 #include "wx/menuitem.h"
 #include "wx/tooltip.h"
 #include "wx/cshelp.h"
+#include "wx/helphtml.h"
 #include "wx/html/htmprint.h"
 #include "wx/html/htmlwin.h"
 #include "wx/filesys.h"
@@ -73,7 +74,7 @@ bool ctApp::OnInit(void)
     wxImage::AddHandler( new wxGIFHandler );
 #endif
 
-#ifdef __WXMSW__
+#if wxUSE_MS_HTML_HELP && !defined(__WXUNIVERSAL__)
     m_helpController = new wxCHMHelpController;
     m_helpControllerReference = new wxCHMHelpController;
 #else
@@ -120,7 +121,7 @@ bool ctApp::OnInit(void)
     wxString helpFilePath(GetFullAppPath(_("configtool")));
     m_helpController->Initialize(helpFilePath);
     
-    ctMainFrame* frame = new ctMainFrame(m_docManager, NULL, -1, wxGetApp().GetSettings().GetAppName(),
+    ctMainFrame* frame = new ctMainFrame(m_docManager, NULL, wxID_ANY, wxGetApp().GetSettings().GetAppName(),
         GetSettings().m_frameSize.GetPosition(), GetSettings().m_frameSize.GetSize(),
         wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN);
     SetTopWindow(frame);
@@ -129,12 +130,12 @@ bool ctApp::OnInit(void)
     {
     case ctSHOW_STATUS_MAXIMIZED:
         {
-            frame->Maximize(TRUE);
+            frame->Maximize(true);
             break;
         }
     case ctSHOW_STATUS_MINIMIZED:
         {
-            frame->Iconize(TRUE);
+            frame->Iconize(true);
             break;
         }
     default:
@@ -171,7 +172,7 @@ bool ctApp::OnInit(void)
         // Load the file
         wxDocument* doc = m_docManager->CreateDocument(arg, wxDOC_SILENT);
         if (doc)
-            doc->SetDocumentSaved(TRUE);
+            doc->SetDocumentSaved(true);
     }
     else
     {
@@ -180,13 +181,13 @@ bool ctApp::OnInit(void)
             // Load the file that was last loaded
             wxDocument* doc = m_docManager->CreateDocument(GetSettings().m_lastFilename, wxDOC_SILENT);
             if (doc)
-                doc->SetDocumentSaved(TRUE);
+                doc->SetDocumentSaved(true);
         }
     }
     
-    GetTopWindow()->Show(TRUE);
+    GetTopWindow()->Show(true);
     
-    return TRUE;
+    return true;
 }
 
 int ctApp::OnExit(void)