Merge branch 'master' of github.com:gnustep/libs-gui into NSBrowser_b…

…indings_branch
gnustep · Sep 28, 2024 · fbad487 · fbad487
2 parents 35fb894 + fb61a0f
commit fbad487
Show file tree

Hide file tree

Showing 8 changed files with 230 additions and 128 deletions.
diff --git a/Headers/Additions/GNUstepGUI/GSHbox.h b/Headers/Additions/GNUstepGUI/GSHbox.h
@@ -169,6 +169,7 @@
 
   </unit>
 */
+APPKIT_EXPORT_CLASS
 @interface GSHbox: GSTable
 {
   BOOL _haveViews;

diff --git a/Headers/Additions/GNUstepGUI/GSPrintOperation.h b/Headers/Additions/GNUstepGUI/GSPrintOperation.h
@@ -44,7 +44,7 @@
 @class NSView;
 @class NSPrintInfo;
 
-
+APPKIT_EXPORT_CLASS
 @interface GSPrintOperation: NSPrintOperation
 {
 }

diff --git a/Headers/Additions/GNUstepGUI/GSTable.h b/Headers/Additions/GNUstepGUI/GSTable.h
@@ -171,6 +171,7 @@
   </section>
   </unit>
 */
+APPKIT_EXPORT_CLASS
 @interface GSTable: NSView
 {
   int _numberOfRows;

diff --git a/Source/GSGuiPrivate.h b/Source/GSGuiPrivate.h
@@ -32,6 +32,7 @@
 
 #import <Foundation/NSBundle.h>
 #import <Foundation/NSCoder.h>
+#import "AppKit/AppKitDefines.h"
 #include "GNUstepBase/GSConfig.h"
 #include <math.h>
 
@@ -40,7 +41,7 @@
  * Should be only used inside the gnustep-gui library.  Implemented
  * in Source/NSApplication.m
  */
-NSBundle *GSGuiBundle (void);
+APPKIT_EXPORT NSBundle *GSGuiBundle (void);
 
 /*
  * Localize a message of the gnustep-gui library.  

diff --git a/Source/GSMemoryPanel.m b/Source/GSMemoryPanel.m
@@ -191,7 +191,9 @@ - (id) init
   NSButton *button;
 
   /* Activate debugging of allocation. */
+#ifndef	NDEBUG
   GSDebugAllocationActive (YES);
+#endif
 
   hbox = [GSHbox new];
   [hbox setDefaultMinXMargin: 5];
@@ -359,6 +361,7 @@ - (void) snapshot: (id)sender
 
 - (void) update: (id)sender
 {
+#ifndef NDEBUG
   Class *classList = GSDebugAllocationClassList ();
   Class *pointer;
   GSMemoryPanelEntry *entry;
@@ -388,6 +391,7 @@ - (void) update: (id)sender
   NSZoneFree(NSDefaultMallocZone(), classList);
 
   [array sortUsingSelector: orderingBy];
+#endif
 
   [table reloadData];
 }

diff --git a/Source/NSBox.m b/Source/NSBox.m
@@ -3,7 +3,7 @@
    <abstract>Simple box view that can display a border and title
    </abstract>
 
-   Copyright (C) 1996-2015 Free Software Foundation, Inc.
+   Copyright (C) 1996-2024 Free Software Foundation, Inc.
 
    Author:  Scott Christley <scottc@net-community.com>
    Date: 1996
@@ -41,6 +41,7 @@
 #import "AppKit/NSTextFieldCell.h"
 #import "AppKit/NSWindow.h"
 #import "GNUstepGUI/GSTheme.h"
+#import "GSGuiPrivate.h"
 
 #include <math.h>
 
@@ -637,10 +638,12 @@ - (id) initWithCoder: (NSCoder*)aDecoder
     }
   else
     {
+      NSInteger tempInt;
+
         [aDecoder decodeValueOfObjCType: @encode(id) at: &_cell];
         _offsets = [aDecoder decodeSize];
-        [aDecoder decodeValueOfObjCType: @encode(int)
-                                     at: &_border_type];
+	decode_NSInteger(aDecoder, &tempInt);
+	_border_type = tempInt;
         [aDecoder decodeValueOfObjCType: @encode(int) 
                                      at: &_title_position];
-Original file line number
+Diff line change
@@ Expand Up / @@ -169,6 +169,7 @@ @@
       </unit>
     */
+    APPKIT_EXPORT_CLASS
     @interface GSHbox: GSTable
     {
       BOOL _haveViews;
@@ Expand Down @@