From d6c3184fe1780bfd4b237ff8d1c6fafdae85ca92 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Sat, 5 Feb 2011 12:11:38 +0200
Subject: [PATCH] Remove menu bar in Windows. Use our platform macroses instead
 of WIN32.

---
 qt/mainwindow.cpp        | 2 ++
 qt/widgets.cpp           | 4 ++--
 qt_tstfrm/tstwidgets.cpp | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index 2117353496..165e78a44a 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -40,10 +40,12 @@ MainWindow::MainWindow()
   setWindowTitle(tr("MapsWithMe"));
   setWindowIcon(QIcon(":logo.png"));
 
+#ifndef OMIM_OS_WINDOWS
   QMenu * helpMenu = new QMenu(tr("Help"), this);
   menuBar()->addMenu(helpMenu);
   helpMenu->addAction(tr("About"), this, SLOT(OnAbout()));
   helpMenu->addAction(tr("Preferences"), this, SLOT(OnPreferences()));
+#endif
 
   LoadState();
 }
diff --git a/qt/widgets.cpp b/qt/widgets.cpp
index 1b6c989304..08cb6e9c97 100644
--- a/qt/widgets.cpp
+++ b/qt/widgets.cpp
@@ -8,7 +8,7 @@
 
 #include "../yg/rendercontext.hpp"
 
-#ifdef WIN32
+#ifdef OMIM_OS_WINDOWS
 #include "../yg/internal/opengl_win32.hpp"
 #endif
 
@@ -28,7 +28,7 @@ namespace qt
   {
     if (m_p == 0)
     {
-#ifdef WIN32
+#ifdef OMIM_OS_WINDOWS
       win32::InitOpenGL();
 #endif
       m_renderContext = shared_ptr<yg::gl::RenderContext>(new qt::gl::RenderContext(this));
diff --git a/qt_tstfrm/tstwidgets.cpp b/qt_tstfrm/tstwidgets.cpp
index 5e4ed79d89..ab953228af 100644
--- a/qt_tstfrm/tstwidgets.cpp
+++ b/qt_tstfrm/tstwidgets.cpp
@@ -9,7 +9,7 @@
 #include "../yg/renderbuffer.hpp"
 #include "../yg/resource_manager.hpp"
 
-#ifdef WIN32
+#ifdef OMIM_OS_WINDOWS
 #include "../yg/internal/opengl_win32.hpp"
 #endif
 
@@ -32,7 +32,7 @@ GLDrawWidget::~GLDrawWidget()
 
 void GLDrawWidget::initializeGL()
 {
-#ifdef WIN32
+#ifdef OMIM_OS_WINDOWS
   win32::InitOpenGL();
 #endif