Skip to content

Changes for new gtk4 wrap #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Changes for new gtk4 wrap #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b3b2b0
Update for new linker class destination
KonstantIMP Jan 16, 2022
2404741
Fix useless isLoaded(string []) usage
KonstantIMP Jan 16, 2022
c44ed34
Fix gtkd.Loader import
KonstantIMP Jan 16, 2022
2cdd5e2
Fix isLoaded
KonstantIMP Jan 16, 2022
91a0538
Merge branch 'gtkd-developers:master' into master
KonstantIMP May 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/gtd/GirPackage.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ final class GirPackage
if ( name == "gdk" || name == "pango" )
buff ~= "import cairo.c.types;\n";

buff ~= "import gtkd.Loader;\n\n";
buff ~= "import linker.Loader;\n\n";
buff ~= getLibraries();
buff ~= "\n\nshared static this()\n{";

Expand Down
6 changes: 3 additions & 3 deletions source/gtd/GirStruct.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ final class GirStruct
buff ~= indenter.format("{");

if ( wrapper.useRuntimeLinker )
buff ~= indenter.format("if ( Linker.isLoaded(LIBRARY_"~ pack.name.replace(".","").toUpper() ~") && ownedRef )");
buff ~= indenter.format("if ( Linker.isLoaded(LIBRARY_"~ pack.name.replace(".","").toUpper() ~"[0]) && ownedRef )");
else
buff ~= indenter.format("if ( ownedRef )");

Expand All @@ -452,7 +452,7 @@ final class GirStruct
buff ~= indenter.format("{");

if ( wrapper.useRuntimeLinker )
buff ~= indenter.format("if ( Linker.isLoaded(LIBRARY_"~ pack.name.replace(".","").toUpper() ~") && ownedRef )");
buff ~= indenter.format("if ( Linker.isLoaded(LIBRARY_"~ pack.name.replace(".","").toUpper() ~"[0]) && ownedRef )");
else
buff ~= indenter.format("if ( ownedRef )");

Expand Down Expand Up @@ -901,7 +901,7 @@ final class GirStruct
imports ~= "glib.MemorySlice";

if ( wrapper.useRuntimeLinker && (shouldFree() || isSimpleStruct()) )
imports ~= "gtkd.Loader";
imports ~= "linker.Loader";

if ( isSimpleStruct() )
{
Expand Down