Skip to content

Commit 5325acd

Browse files
Revert "Merge pull request #90 from summer-alice/add_cTabFolderRenderer"
This reverts commit 7772b33, reversing changes made to b54c611.
1 parent efc2e8b commit 5325acd

File tree

4 files changed

+6
-507
lines changed

4 files changed

+6
-507
lines changed

dub.sdl

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ subPackage {
1818
configuration "linux-gtk" {
1919
platforms "linux"
2020
sourcePaths "org.eclipse.swt.gtk.linux.x86/src" \
21-
"org.eclipse.swt/Eclipse SWT/common" \
22-
"org.eclipse.swt/Eclipse SWT Custom Widgets/common"
21+
"org.eclipse.swt/Eclipse SWT/common"
2322
importPaths "org.eclipse.swt.gtk.linux.x86/src" \
24-
"org.eclipse.swt/Eclipse SWT/common" \
25-
"org.eclipse.swt/Eclipse SWT Custom Widgets/common"
23+
"org.eclipse.swt/Eclipse SWT/common"
2624
stringImportPaths "org.eclipse.swt.gtk.linux.x86/res"
2725

2826
excludedSourceFiles \
@@ -35,11 +33,9 @@ configuration "linux-gtk" {
3533
configuration "windows-win32" {
3634
platforms "windows"
3735
sourcePaths "org.eclipse.swt.win32.win32.x86/src" \
38-
"org.eclipse.swt/Eclipse SWT/common" \
39-
"org.eclipse.swt/Eclipse SWT Custom Widgets/common"
36+
"org.eclipse.swt/Eclipse SWT/common"
4037
importPaths "org.eclipse.swt.win32.win32.x86/src" \
41-
"org.eclipse.swt/Eclipse SWT/common" \
42-
"org.eclipse.swt/Eclipse SWT Custom Widgets/common"
38+
"org.eclipse.swt/Eclipse SWT/common"
4339
stringImportPaths "org.eclipse.swt.win32.win32.x86/res"
4440

4541
excludedSourceFiles \
@@ -78,14 +74,12 @@ configuration "unittest-gtk" {
7874
sourcePaths \
7975
"tests/" \
8076
"org.eclipse.swt.gtk.linux.x86/src" \
81-
"org.eclipse.swt/Eclipse SWT/common" \
82-
"org.eclipse.swt/Eclipse SWT Custom Widgets/common"
77+
"org.eclipse.swt/Eclipse SWT/common"
8378

8479
importPaths \
8580
"tests/" \
8681
"org.eclipse.swt.gtk.linux.x86/src" \
87-
"org.eclipse.swt/Eclipse SWT/common" \
88-
"org.eclipse.swt/Eclipse SWT Custom Widgets/common"
82+
"org.eclipse.swt/Eclipse SWT/common"
8983

9084
stringImportPaths "org.eclipse.swt.gtk.linux.x86/res"
9185

org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabFolder.d

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ public class CTabFolder : Composite {
147147
int fixedTabHeight = SWT.DEFAULT;
148148
int tabHeight;
149149
int minChars = 20;
150-
bool borderVisible = false;
151150

152151
/* item management */
153152
CTabItem[] items;
@@ -338,7 +337,6 @@ public this(Composite parent, int style) {
338337
// showMin = (style2 & SWT.MIN) !is 0; - conflicts with SWT.TOP
339338
// showMax = (style2 & SWT.MAX) !is 0; - conflicts with SWT.BOTTOM
340339
single = (style2 & SWT.SINGLE) !is 0;
341-
borderVisible = (style & SWT.BORDER) !is 0;
342340
borderLeft = borderRight = (style & SWT.BORDER) !is 0 ? 1 : 0;
343341
borderTop = onBottom ? borderLeft : 0;
344342
borderBottom = onBottom ? 0 : borderLeft;

org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/CTabFolder.d

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ public class CTabFolder : Composite {
147147
int fixedTabHeight = SWT.DEFAULT;
148148
int tabHeight;
149149
int minChars = 20;
150-
bool borderVisible = false;
151150

152151
/* item management */
153152
CTabItem[] items;
@@ -338,7 +337,6 @@ public this(Composite parent, int style) {
338337
// showMin = (style2 & SWT.MIN) !is 0; - conflicts with SWT.TOP
339338
// showMax = (style2 & SWT.MAX) !is 0; - conflicts with SWT.BOTTOM
340339
single = (style2 & SWT.SINGLE) !is 0;
341-
borderVisible = (style & SWT.BORDER) !is 0;
342340
borderLeft = borderRight = (style & SWT.BORDER) !is 0 ? 1 : 0;
343341
borderTop = onBottom ? borderLeft : 0;
344342
borderBottom = onBottom ? 0 : borderLeft;

0 commit comments

Comments
 (0)