sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed a couple more win32 defines that I had temporarily inserted to disable building postgres related stuff:

Browse Source 
- 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@6082 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
timlinux 2006-11-12 01:57:03 +00:00
parent cfcd560093
commit e64c9a906c
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/qgisapp.cpp
View File

@ -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()