mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 15:10:47 +00:00
Merge GSToolbar with NSToolbar and remove all traces of the old class.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27491 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
7ce954508f
commit
aed7756d65
11 changed files with 1242 additions and 1405 deletions
|
@ -33,11 +33,11 @@
|
|||
#define _GSToolbarView_h_INCLUDE
|
||||
|
||||
#include <Foundation/NSGeometry.h>
|
||||
// Necessary for NSToolbarDisplayMode and NSToolbarSizeMode
|
||||
#include <AppKit/NSToolbar.h>
|
||||
#include <AppKit/NSView.h>
|
||||
#include <AppKit/NSColor.h>
|
||||
|
||||
#include "GNUstepGUI/GSToolbar.h"
|
||||
// Necessary for NSToolbarDisplayMode and NSToolbarSizeMode
|
||||
|
||||
@class NSMutableArray;
|
||||
@class NSClipView;
|
||||
|
@ -54,7 +54,7 @@ typedef enum {
|
|||
|
||||
@interface GSToolbarView : NSView
|
||||
{
|
||||
GSToolbar *_toolbar;
|
||||
NSToolbar *_toolbar;
|
||||
NSClipView *_clipView, *_clipViewForEditMode;
|
||||
GSToolbarClippedItemsButton *_clippedItemsMark;
|
||||
NSMutableArray *_visibleBackViews;
|
||||
|
@ -72,8 +72,8 @@ typedef enum {
|
|||
sizeMode: (NSToolbarSizeMode)sizeMode;
|
||||
|
||||
// Accessors
|
||||
- (GSToolbar *) toolbar;
|
||||
- (void) setToolbar: (GSToolbar *)toolbar;
|
||||
- (NSToolbar *) toolbar;
|
||||
- (void) setToolbar: (NSToolbar *)toolbar;
|
||||
- (unsigned int) borderMask;
|
||||
- (void) setBorderMask: (unsigned int)borderMask;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue