Skip to content

Commit e64c9a9

Browse files
author
timlinux
committedNov 12, 2006
Removed a couple more win32 defines that I had temporarily inserted to 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@6082 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent cfcd560 commit e64c9a9

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed
 

‎src/gui/qgisapp.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -771,10 +771,8 @@ void QgisApp::createMenus()
771771
mLayerMenu = menuBar()->addMenu(tr("&Layer"));
772772
mLayerMenu->addAction(mActionAddNonDbLayer);
773773
mLayerMenu->addAction(mActionAddRasterLayer);
774-
#ifndef WIN32
775774
#ifdef HAVE_POSTGRESQL
776775
mLayerMenu->addAction(mActionAddLayer);
777-
#endif
778776
#endif
779777
mLayerMenu->addAction(mActionAddWmsLayer);
780778
mLayerMenu->addAction(mActionRemoveLayer);
@@ -837,10 +835,8 @@ void QgisApp::createToolBars()
837835
mLayerToolBar->setObjectName("LayerToolBar");
838836
mLayerToolBar->addAction(mActionAddNonDbLayer);
839837
mLayerToolBar->addAction(mActionAddRasterLayer);
840-
#ifndef WIN32
841838
#ifdef HAVE_POSTGRESQL
842839
mLayerToolBar->addAction(mActionAddLayer);
843-
#endif
844840
#endif
845841
mLayerToolBar->addAction(mActionAddWmsLayer);
846842
mLayerToolBar->addAction(mActionNewVectorLayer);
@@ -1947,10 +1943,9 @@ bool QgisApp::isValidVectorFileName(QString * theFileNameQString)
19471943
return isValidVectorFileName(*theFileNameQString);
19481944
}
19491945

1950-
#ifndef WIN32
1951-
#ifndef HAVE_POSTGRESQL
1946+
#ifndef HAVE_POSTGRESQL
19521947
void QgisApp::addDatabaseLayer(){}
1953-
#else
1948+
#else
19541949
void QgisApp::addDatabaseLayer()
19551950
{
19561951
// only supports postgis layers at present
@@ -2026,9 +2021,6 @@ void QgisApp::addDatabaseLayer()
20262021
// QApplication::restoreOverrideCursor();
20272022

20282023
} // QgisApp::addDatabaseLayer()
2029-
#endif
2030-
#else
2031-
void QgisApp::addDatabaseLayer(){}
20322024
#endif
20332025

20342026
void QgisApp::addWmsLayer()

0 commit comments

Comments
 (0)
Please sign in to comment.