[Git][wxwidgets/wxwidgets][master] 2 commits: Remove unused member variable in wxWebViewChromium code

1 view
Skip to first unread message

Vadim Zeitlin (@_VZ_)

unread,
Jan 10, 2026, 5:43:35 PMJan 10
to wx-commi...@googlegroups.com

Vadim Zeitlin pushed to branch master at wxWidgets / wxWidgets

Commits:

  • 0a65254a
    by Vadim Zeitlin at 2026-01-10T21:36:44+01:00 
    Remove unused member variable in wxWebViewChromium code

Thanks clang for the warning.

No real changes.
  • 312645b9
    by Maarten Bent at 2026-01-10T23:38:08+01:00 
    CMake: Search for GTK2 using pkg-config first

Add a copy of the FindGTK3 module, but modified for GTK2.
If it fails, use the CMake's default FindGTK2.

Fixes #26040.

Closes 26091.

2 changed files:

Changes:

  • build/cmake/modules/FindGTK2.cmake
    1 
    +# - Try to find GTK+ 2
    2 
    +# Once done, this will define
    3 
    +#
    4 
    +# GTK2_FOUND - system has GTK+ 2.
    5 
    +# GTK2_INCLUDE_DIRS - the GTK+ 2. include directories
    6 
    +# GTK2_LIBRARIES - link these to use GTK+ 2.
    7 
    +#
    8 
    +# Copyright (C) 2012 Raphael Kubo da Costa <rak...@webkit.org>
    9 
    +# Copyright (C) 2013 Igalia S.L.
    10 
    +#
    11 
    +# Redistribution and use in source and binary forms, with or without
    12 
    +# modification, are permitted provided that the following conditions
    13 
    +# are met:
    14 
    +# 1. Redistributions of source code must retain the above copyright
    15 
    +# notice, this list of conditions and the following disclaimer.
    16 
    +# 2. Redistributions in binary form must reproduce the above copyright
    17 
    +# notice, this list of conditions and the following disclaimer in the
    18 
    +# documentation and/or other materials provided with the distribution.
    19 
    +#
    20 
    +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
    21 
    +# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
    22 
    +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
    23 
    +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
    24 
    +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
    25 
    +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
    26 
    +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
    27 
    +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
    28 
    +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
    29 
    +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
    30 
    +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    31 
    +find_package(PkgConfig)
    32 
    +pkg_check_modules(GTK2 QUIET gtk+-2.0)
    33 
    +set(VERSION_OK TRUE)
    34 
    +if (GTK2_VERSION)
    35 
    +if (GTK2_FIND_VERSION_EXACT)
    36 
    +if (NOT("${GTK2_FIND_VERSION}" VERSION_EQUAL "${GTK2_VERSION}"))
    37 
    +set(VERSION_OK FALSE)
    38 
    +endif ()
    39 
    +else ()
    40 
    +if ("${GTK2_VERSION}" VERSION_LESS "${GTK2_FIND_VERSION}")
    41 
    +set(VERSION_OK FALSE)
    42 
    +endif ()
    43 
    +endif ()
    44 
    +endif ()
    45 
    +
    46 
    +# silence output
    47 
    +set(GTK2_FIND_QUIETLY_TEMP ${GTK2_FIND_QUIETLY})
    48 
    +set(GTK2_FIND_QUIETLY TRUE)
    49 
    +
    50 
    +include(FindPackageHandleStandardArgs)
    51 
    +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2 DEFAULT_MSG GTK2_INCLUDE_DIRS GTK2_LIBRARIES VERSION_OK)
    52 
    +
    53 
    +set(GTK2_FIND_QUIETLY ${GTK2_FIND_QUIETLY_TEMP})
    54 
    +
    55 
    +mark_as_advanced(GTK2_INCLUDE_DIRS GTK2_LIBRARIES)
    56 
    +
    57 
    +# not found using PkgConfig, use CMake's FindGTK2
    58 
    +if(NOT GTK2_FOUND)
    59 
    +    set(CMAKE_MODULE_PATH_TEMP ${CMAKE_MODULE_PATH})
    60 
    +    set(CMAKE_MODULE_PATH "")
    61 
    +    find_package(GTK2)
    62 
    +    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH_TEMP})
    63 
    +endif()

  • src/common/webview_chromium.cpp
    ... ... @@ -578,7 +578,7 @@ private:
    578 578 
     class SchemeHandler : public CefResourceHandler
    579 579 
     {
    580 580 
     public:
    581 
    -    SchemeHandler(const wxSharedPtr<wxWebViewHandler>& handler) : m_handler(handler), m_offset(0) {}
    581 
    +    SchemeHandler(const wxSharedPtr<wxWebViewHandler>& handler) : m_handler(handler) {}
    582 582
    583 583 
         // CefResourceHandler methods
    584 584 
         virtual bool ProcessRequest(CefRefPtr<CefRequest> request,
    ... ... @@ -603,7 +603,6 @@ private:
    603 603
    604 604 
         std::string m_data;
    605 605 
         std::string m_mime_type;
    606 
    -    size_t m_offset;
    607 606
    608 607 
         IMPLEMENT_REFCOUNTING(SchemeHandler);
    609 608 
         base::Lock m_lock;

Reply all
Reply to author
Forward
0 new messages