Opened 5 years ago

Closed 4 years ago

#17651 closed defect (fixed)

Fix wxGTK/Win32 DLL build

Reported by: kosenko Owned by:
Priority: normal Milestone:
Component: wxGTK Version: dev-latest
Keywords: Cc:
Blocked By: Blocking:
Patch: yes

Description

Changes:

  1. Use Win32-base classes for mime types under Windows. Also add link dependency to GTK+ gio library.
  2. Under Windows we have two wxDisplay implementations that conflicts with each other: GTK+ and Win32-platform. Patch uses Win32 implementation because it is more mature yet at least for GTK+ 2.

Changes can be tested with patch and bakefile regeneration:

  • build/bakefiles/common.bkl

    diff --git build/bakefiles/common.bkl build/bakefiles/common.bkl
    index 151c555..9749110 100644
    $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h 
    423423        <if cond="IS_MSVC_PRJ">
    424424            <msvc-headers-setup-h>
    425425                msw/setup.h
     426                gtk/setup.h
    426427                univ/setup.h
    427428            </msvc-headers-setup-h>
    428429            <set var="_custom_build_include_wx_msw_setup_h">
  • build/bakefiles/config.bkl

    diff --git build/bakefiles/config.bkl build/bakefiles/config.bkl
    index 1ea0da7..a7da71e 100644
     
    6666        </if>
    6767
    6868        <!-- We must make TOOLKIT a constant under Windows -->
    69         <if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
     69        <!--if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
    7070            <set var="TOOLKIT">MSW</set>
    71         </if>
     71        </if-->
    7272    </if>
    7373
    7474    <!--

Attachments (1)

gtkwin32_dll.diff download (2.3 KB) - added by kosenko 5 years ago.

Download all attachments as: .zip

Change History (2)

Changed 5 years ago by kosenko

comment:1 Changed 4 years ago by kosenko

  • Resolution set to fixed
  • Status changed from new to closed

AFAICS ticket was fixed in 897ffb58b0b96582891c8cb207a2f81f98f7e41c/git-wxWidgets but not closed here.

Note: See TracTickets for help on using tickets.