Skip to content
Permalink
Browse files
Removed a couple more win32 defines that I had temporarily inserted t…
…o disable building postgres related stuff:

 - menu entry for add pg layer now enabled
 - toolbar icon reinstated
 - adddbayer no longer ifdefs out on windows

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6082 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Nov 12, 2006
1 parent 35d52a7 commit b9950a426d414aa60a033ccf066b181247572ec6
Showing with 2 additions and 10 deletions.
  1. +2 −10 src/gui/qgisapp.cpp
@@ -771,10 +771,8 @@ void QgisApp::createMenus()
mLayerMenu = menuBar()->addMenu(tr("&Layer"));
mLayerMenu->addAction(mActionAddNonDbLayer);
mLayerMenu->addAction(mActionAddRasterLayer);
#ifndef WIN32
#ifdef HAVE_POSTGRESQL
mLayerMenu->addAction(mActionAddLayer);
#endif
#endif
mLayerMenu->addAction(mActionAddWmsLayer);
mLayerMenu->addAction(mActionRemoveLayer);
@@ -837,10 +835,8 @@ void QgisApp::createToolBars()
mLayerToolBar->setObjectName("LayerToolBar");
mLayerToolBar->addAction(mActionAddNonDbLayer);
mLayerToolBar->addAction(mActionAddRasterLayer);
#ifndef WIN32
#ifdef HAVE_POSTGRESQL
mLayerToolBar->addAction(mActionAddLayer);
#endif
#endif
mLayerToolBar->addAction(mActionAddWmsLayer);
mLayerToolBar->addAction(mActionNewVectorLayer);
@@ -1947,10 +1943,9 @@ bool QgisApp::isValidVectorFileName(QString * theFileNameQString)
return isValidVectorFileName(*theFileNameQString);
}

#ifndef WIN32
#ifndef HAVE_POSTGRESQL
#ifndef HAVE_POSTGRESQL
void QgisApp::addDatabaseLayer(){}
#else
#else
void QgisApp::addDatabaseLayer()
{
// only supports postgis layers at present
@@ -2026,9 +2021,6 @@ void QgisApp::addDatabaseLayer()
// QApplication::restoreOverrideCursor();

} // QgisApp::addDatabaseLayer()
#endif
#else
void QgisApp::addDatabaseLayer(){}
#endif

void QgisApp::addWmsLayer()

0 comments on commit b9950a4

Please sign in to comment.