Merge branch 'mariuz:master' into master

.github/workflows/ccpp.yml

@@ -9,10 +9,11 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    #runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: wxWidgets 3.2
       run: sudo apt-key adv --fetch-keys http://repos.codelite.org/CodeLite.asc
     - name: add repository

.github/workflows/codeql-analysis.yml

@@ -23,7 +23,8 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    #runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       actions: read
       contents: read
@@ -39,11 +40,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,7 +69,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
 
     # ℹ️ Command-line programs to run using the OS shell.
@@ -83,4 +84,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/windows-build.yml

@@ -14,11 +14,11 @@ jobs:
     runs-on: windows-latest
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: wxWidget cache
       id: cache-wxwidget
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
             wxWidgets

CMakeLists.txt

@@ -323,6 +323,7 @@ list(APPEND IBPP_SOURCE_LIST
         ${SOURCEDIR}/ibpp/dbkey.cpp
         ${SOURCEDIR}/ibpp/events.cpp
         ${SOURCEDIR}/ibpp/exception.cpp
+        ${SOURCEDIR}/ibpp/fbinterfaces.cpp
         ${SOURCEDIR}/ibpp/ibint128.cpp
         ${SOURCEDIR}/ibpp/row.cpp
         ${SOURCEDIR}/ibpp/service.cpp
@@ -357,6 +358,8 @@ list(APPEND IBPP_HEADER_LIST
 		${SOURCEDIR}/firebird/include/firebird/impl/msg/sqlerr.h
 		${SOURCEDIR}/firebird/include/firebird/impl/msg/sqlwarn.h
 		${SOURCEDIR}/firebird/include/firebird/impl/msg/utl.h		
+		${SOURCEDIR}/firebird/include/firebird/Interface.h
+		${SOURCEDIR}/firebird/include/firebird/IdlFbInterfaces.h
         ${SOURCEDIR}/ibpp/_ibpp.h
         ${SOURCEDIR}/ibpp/ibpp.h
 )
@@ -397,7 +400,7 @@ if (UNIX AND NOT APPLE)
 	add_definitions(-DIBPP_LINUX)
 	add_definitions(-DFR_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
 	# Need to link the fbclient lib in *nix systems
-	list(APPEND FR_LIBS -lfbclient)
+	list(APPEND FR_LIBS -lfbclient -ldl)
 
 	include(CheckCXXSourceCompiles)
 	check_cxx_source_compiles("

README.md

@@ -16,6 +16,9 @@ The following people also made a significant non-coding contributions:
 * Alex Stanciu
 * Barbara Del Vecchio
 
+Notice:
+Now you can download latest Windows snapshot builds directly from the `Build Flamerobin for Windows` Action
+
 License
 ---------------------------
 FlameRobin code is licensed under the MIT license.

install/win32/FlameRobinSetup.iss

@@ -56,7 +56,7 @@ LicenseFile=..\..\docs-src\fr_license.txt
 InfoBeforeFile=info_before_win64.rtf
 #endif
 InfoAfterFile=
-MinVersion=0,6.0
+MinVersion=0,6.1
 #ifdef DEBUG
 Compression=lzma/ultra
 #ifdef X64VERSION

src/core/StringUtils.cpp

@@ -259,7 +259,7 @@ wxString wrapText(const wxString& text, size_t maxWidth, size_t indent)
             if (lastSpace != text.end())
             {
                 size_t width = line.Length();
-                if (width > maxWidth - indentStr.Length())
+                if ((width > maxWidth - indentStr.Length()) && (wrapState == none))
                 {
                     // remove the last word from this line
                     line.erase(lastSpace - lineStart, it + 1 - lineStart);