Linux support

CMakeLists.txt

@@ -3,11 +3,12 @@ cmake_minimum_required(VERSION 3.0.0)
 project(pgAdmin3 VERSION 1.26.0)
 include_directories(. include include/libssh2
 )
-add_compile_definitions(WX_PRECOMP)
+if(UNIX)
+  add_compile_definitions(NO_WXJSON_GIT)
+endif()
 add_compile_definitions(WX_PRECOMP)
 add_compile_definitions(wxUSE_UNICODE)
 add_compile_definitions(EMBED_XRC)
-#add_compile_definitions(EMBED_XRC)
 add_compile_options(-Wno-narrowing
 )
 
@@ -45,15 +46,15 @@ else()
     include_directories(${LIBXML2_INCLUDE_DIR})
     link_libraries(${LIBXML2_LIBRARIES})
 endif()
-find_package(wxWidgets REQUIRED stc aui base net core xrc html xml)
-    if(NOT wxWidgets_FOUND)
-        message(SEND_ERROR "Failed to find wxWidgets ")
-        return()
-    else()
-        include(${wxWidgets_USE_FILE})
-        include_directories(${wxWidgets_INCLUDE_DIRS})
-        link_libraries(${wxWidgets_LIBRARIES})
-    endif()
+find_package(wxWidgets 3.2 REQUIRED stc aui base net core xrc html xml)
+if(NOT wxWidgets_FOUND)
+    message(SEND_ERROR "Failed to find wxWidgets ")
+    return()
+else()
+    include(${wxWidgets_USE_FILE})
+    include_directories(${wxWidgets_INCLUDE_DIRS})
+    link_libraries(${wxWidgets_LIBRARIES})
+endif()
 
 find_package(PostgreSQL REQUIRED)
 if(NOT PostgreSQL_FOUND)

frm/frmAwr.cpp

@@ -1,4 +1,4 @@
-#include "pgadmin3.h"
+#include "pgAdmin3.h"
 #include <wx/file.h>
 #include "frm/frmAwr.h"
 #include "schema/pgObject.h"

include/ctl/SourceViewDialog.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "pgAdmin3.h"
+
 class SourceViewDialog : public wxFrame
 {
     ctlSQLBox* m_text1;
@@ -11,7 +13,7 @@ class SourceViewDialog : public wxFrame
     int pos = 0;
     int prev_line = -1;
 public:
-    SourceViewDialog::~SourceViewDialog() {
+    ~SourceViewDialog() {
         //delete m_text1;
         //m_btn_close->UnBind();
     }

include/pgAdmin3.h

@@ -11,9 +11,7 @@
 
 #ifndef PGADMIN3_H
 #define PGADMIN3_H
-#ifdef WIN32
 #include "../utils/diff_match_patch.h"
-#endif
 
 // wxWindows headers
 #include <wx/wx.h>

schema/pgServer.cpp

@@ -1638,7 +1638,7 @@ pgObject *pgServerFactory::CreateObjects(pgCollection *obj, ctlTree *browser, co
 		server = new pgServer(servername, hostaddr, description, service, database, username, port, StrToBool(storePwd), rolename, connstr, StrToBool(restore), ssl,
 		                      colour, group, StrToBool(sshTunnel), tunnelHost, tunnelUserName, StrToBool(authModePwd), tunnelPassword, publicKeyFile, identityFile, tunnelPort);
 #else
-		server = new pgServer(servername, hostaddr, description, service, database, username, port, StrToBool(storePwd), rolename, StrToBool(restore), ssl,
+		server = new pgServer(servername, hostaddr, description, service, database, username, port, StrToBool(storePwd), rolename, wxT(""), StrToBool(restore), ssl,
 		                      colour, group);
 #endif
 		server->iSetLastDatabase(lastDatabase);
@@ -1870,7 +1870,7 @@ pgObject *pgServerFactory::CreateObjects(pgCollection *obj, ctlTree *browser, co
 					// Add the item, if it looks sane
 					if (port != 0 && username != wxEmptyString)
 					{
-						server = new pgServer(servername, wxEmptyString, description, wxEmptyString, wxT("edb"), username, port, false, rolename, 0);
+						server = new pgServer(servername, wxEmptyString, description, wxEmptyString, wxT("edb"), username, port, false, rolename, wxT(""), 0);
 						server->iSetDiscoveryID(cnf->GetPath() + wxT("/") + version);
 						server->iSetDiscovered(true);
 						groupitem = browser->GetFirstChild(obj->GetId(), groupcookie);