* Source/NSTextView_actions.m:

* Source/NSOpenPanel.m:
        * Source/GSLayoutManager.m:
        * Source/NSLayoutManager.m:
        * Source/NSSavePanel.m:
        * Source/NSTextView.m:
        * Source/NSStringDrawing.m:
        * Headers/Additions/GNUstepGUI/GSLayoutManager_internal.h:
        * Headers/AppKit/NSTextView.h: Remove underscores from category names
        as they can confuse the debugger.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24032 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ratmice 2006-11-06 10:19:20 +00:00
parent 490db23477
commit b913f96dc2
10 changed files with 36 additions and 23 deletions

View file

@ -1,3 +1,16 @@
2006-11-06 Matt Rice <ratmice@yahoo.com>
* Source/NSTextView_actions.m:
* Source/NSOpenPanel.m:
* Source/GSLayoutManager.m:
* Source/NSLayoutManager.m:
* Source/NSSavePanel.m:
* Source/NSTextView.m:
* Source/NSStringDrawing.m:
* Headers/Additions/GNUstepGUI/GSLayoutManager_internal.h:
* Headers/AppKit/NSTextView.h: Remove underscores from category names
as they can confuse the debugger.
2006-11-05 Matt Rice <ratmice@yahoo.com> 2006-11-05 Matt Rice <ratmice@yahoo.com>
* Source/NSSlider.m (-keyDown:): Implement, Fixes bug #14000. * Source/NSSlider.m (-keyDown:): Implement, Fixes bug #14000.

View file

@ -207,7 +207,7 @@ typedef struct GSLayoutManager_textcontainer_s
@interface GSLayoutManager (glyphs_helpers) @interface GSLayoutManager (GlyphsHelpers)
-(void) _run_cache_attributes: (glyph_run_t *)r : (NSDictionary *)attributes; -(void) _run_cache_attributes: (glyph_run_t *)r : (NSDictionary *)attributes;
-(void) _run_copy_attributes: (glyph_run_t *)dst : (const glyph_run_t *)src; -(void) _run_copy_attributes: (glyph_run_t *)dst : (const glyph_run_t *)src;
@ -234,7 +234,7 @@ typedef struct GSLayoutManager_textcontainer_s
@interface GSLayoutManager (layout_helpers) @interface GSLayoutManager (LayoutHelpers)
-(void) _freeLayout; -(void) _freeLayout;
-(void) _invalidateLayoutFromContainer: (int)idx; -(void) _invalidateLayoutFromContainer: (int)idx;

View file

@ -393,7 +393,7 @@ These methods are implemented in NSTextView_actions.m. See the comment in
that file for details on the split and which methods are for that file for details on the split and which methods are for
user/programmatic changes of the text. user/programmatic changes of the text.
*/ */
@interface NSTextView (user_actions) @interface NSTextView (UserActions)
-(void) alignJustified: (id)sender; /* mosx */ -(void) alignJustified: (id)sender; /* mosx */
@ -538,7 +538,7 @@ already been laid out. */
@end @end
@interface NSTextView (GSTextView_sync) @interface NSTextView (GSTextViewSync)
/* /*
* This queries the NSLayoutManager to see if it is using multiple * This queries the NSLayoutManager to see if it is using multiple
* text views, and saves this information in a flag, and caches the * text views, and saves this information in a flag, and caches the

View file

@ -54,10 +54,10 @@ static int random_level(void)
/* /*
Private method used internally by GSLayoutManager for sanity checking. Private method used internally by GSLayoutManager for sanity checking.
*/ */
@interface NSTextStorage (GSLayoutManager_sanity_checking) @interface NSTextStorage (GSLayoutManagerSanityChecking)
-(unsigned int) _editCount; -(unsigned int) _editCount;
@end @end
@implementation NSTextStorage (GSLayoutManager_sanity_checking) @implementation NSTextStorage (GSLayoutManagerSanityChecking)
-(unsigned int) _editCount; -(unsigned int) _editCount;
{ {
return _editCount; return _editCount;
@ -67,7 +67,7 @@ Private method used internally by GSLayoutManager for sanity checking.
/***** Glyph handling *****/ /***** Glyph handling *****/
@implementation GSLayoutManager (glyphs_helpers) @implementation GSLayoutManager (GlyphsHelpers)
-(void) _run_cache_attributes: (glyph_run_t *)r : (NSDictionary *)attributes -(void) _run_cache_attributes: (glyph_run_t *)r : (NSDictionary *)attributes
@ -1517,7 +1517,7 @@ places where we switch.
/***** Layout handling *****/ /***** Layout handling *****/
@implementation GSLayoutManager (layout_helpers) @implementation GSLayoutManager (LayoutHelpers)
-(void) _invalidateLayoutFromContainer: (int)idx -(void) _invalidateLayoutFromContainer: (int)idx
{ {

View file

@ -119,11 +119,11 @@ first. Remaining cases, highest priority first:
@interface NSLayoutManager (layout_helpers) @interface NSLayoutManager (LayoutHelpers)
-(void) _doLayoutToContainer: (int)cindex point: (NSPoint)p; -(void) _doLayoutToContainer: (int)cindex point: (NSPoint)p;
@end @end
@implementation NSLayoutManager (layout_helpers) @implementation NSLayoutManager (LayoutHelpers)
-(void) _doLayoutToContainer: (int)cindex point: (NSPoint)p -(void) _doLayoutToContainer: (int)cindex point: (NSPoint)p
{ {
[self _doLayout]; [self _doLayout];

View file

@ -54,7 +54,7 @@
static NSOpenPanel *_gs_gui_open_panel = nil; static NSOpenPanel *_gs_gui_open_panel = nil;
// Pacify the compiler // Pacify the compiler
@interface NSSavePanel (_PrivateMethods) @interface NSSavePanel (GSPrivateMethods)
- (void) _resetDefaults; - (void) _resetDefaults;
- (void) _selectCellName: (NSString *)title; - (void) _selectCellName: (NSString *)title;
- (void) _selectTextInColumn: (int)column; - (void) _selectTextInColumn: (int)column;
@ -63,7 +63,7 @@ static NSOpenPanel *_gs_gui_open_panel = nil;
- (NSComparisonResult) _compareFilename: (NSString *)n1 with: (NSString *)n2; - (NSComparisonResult) _compareFilename: (NSString *)n1 with: (NSString *)n2;
@end @end
@implementation NSOpenPanel (_PrivateMethods) @implementation NSOpenPanel (GSPrivateMethods)
- (void) _resetDefaults - (void) _resetDefaults
{ {
[super _resetDefaults]; [super _resetDefaults];

View file

@ -67,14 +67,14 @@ static BOOL _gs_display_reading_progress = NO;
// //
// SavePanel filename compare // SavePanel filename compare
// //
@interface NSString (_gsSavePanel) @interface NSString (GSSavePanel)
- (NSComparisonResult)_gsSavePanelCompare:(NSString *)other; - (NSComparisonResult)_gsSavePanelCompare:(NSString *)other;
@end @end
// //
// NSSavePanel private methods // NSSavePanel private methods
// //
@interface NSSavePanel (_PrivateMethods) @interface NSSavePanel (GSPrivateMethods)
// Methods to manage default settings // Methods to manage default settings
- (id) _initWithoutGModel; - (id) _initWithoutGModel;
@ -93,7 +93,7 @@ static BOOL _gs_display_reading_progress = NO;
- (NSComparisonResult) _compareFilename: (NSString *)n1 with: (NSString *)n2; - (NSComparisonResult) _compareFilename: (NSString *)n1 with: (NSString *)n2;
@end /* NSSavePanel (PrivateMethods) */ @end /* NSSavePanel (PrivateMethods) */
@implementation NSSavePanel (_PrivateMethods) @implementation NSSavePanel (PrivateMethods)
- (NSDragOperation) draggingEntered: (id <NSDraggingInfo>)sender - (NSDragOperation) draggingEntered: (id <NSDraggingInfo>)sender
{ {
@ -1292,7 +1292,7 @@ selectCellWithString: (NSString*)title
// //
// SavePanel filename compare // SavePanel filename compare
// //
@implementation NSString (_gsSavePanel) @implementation NSString (GSSavePanel)
- (NSComparisonResult)_gsSavePanelCompare:(NSString *)other - (NSComparisonResult)_gsSavePanelCompare:(NSString *)other
{ {
int sLength, oLength; int sLength, oLength;
@ -1373,7 +1373,7 @@ selectCellWithString: (NSString*)title
// //
// NSSavePanel browser delegate methods // NSSavePanel browser delegate methods
// //
@interface NSSavePanel (_BrowserDelegate) @interface NSSavePanel (GSBrowserDelegate)
- (void) browser: (NSBrowser*)sender - (void) browser: (NSBrowser*)sender
createRowsForColumn: (int)column createRowsForColumn: (int)column
inMatrix: (NSMatrix*)matrix; inMatrix: (NSMatrix*)matrix;
@ -1405,7 +1405,7 @@ static int compareFilenames (id elem1, id elem2, void *context)
} }
@implementation NSSavePanel (_BrowserDelegate) @implementation NSSavePanel (GSBrowserDelegate)
- (void) browser: (NSBrowser*)sender - (void) browser: (NSBrowser*)sender
createRowsForColumn: (int)column createRowsForColumn: (int)column
inMatrix: (NSMatrix*)matrix inMatrix: (NSMatrix*)matrix

View file

@ -373,7 +373,7 @@ The text system always has positive y down, so we flip the coordinate
system when drawing (if the view isn't flipped already). This causes the system when drawing (if the view isn't flipped already). This causes the
glyphs to be drawn upside-down, so we need to tell NSFont to flip the fonts. glyphs to be drawn upside-down, so we need to tell NSFont to flip the fonts.
*/ */
@interface NSFont (font_flip_hack) @interface NSFont (FontFlipHack)
+(void) _setFontFlipHack: (BOOL)flip; +(void) _setFontFlipHack: (BOOL)flip;
@end @end

View file

@ -287,7 +287,7 @@ for roundoff issues. Whole points should be representable. */
/* For when more than one text view is connected to a layout manager. /* For when more than one text view is connected to a layout manager.
Helpers are here, the actual methods are in the main implementation. */ Helpers are here, the actual methods are in the main implementation. */
@implementation NSTextView (GSTextView_sync) @implementation NSTextView (GSTextViewSync)
#define SET_DELEGATE_NOTIFICATION(notif_name) \ #define SET_DELEGATE_NOTIFICATION(notif_name) \

View file

@ -113,7 +113,7 @@ send -shouldChangeTextInRange:replacementString: or -didChangeText.
/** First some helpers **/ /** First some helpers **/
@interface NSTextView (user_action_helpers) @interface NSTextView (UserActionHelpers)
-(void) _illegalMovement: (int)textMovement; -(void) _illegalMovement: (int)textMovement;
@ -124,7 +124,7 @@ send -shouldChangeTextInRange:replacementString: or -didChangeText.
@end @end
@implementation NSTextView (user_action_helpers) @implementation NSTextView (UserActionHelpers)
- (void) _illegalMovement: (int)textMovement - (void) _illegalMovement: (int)textMovement
{ {
@ -221,7 +221,7 @@ send -shouldChangeTextInRange:replacementString: or -didChangeText.
@end @end
@implementation NSTextView (user_actions) @implementation NSTextView (UserActions)
/* Helpers used with _changeAttribute:inRange:using:. */ /* Helpers used with _changeAttribute:inRange:using:. */
static NSNumber *int_minus_one(NSNumber *cur) static NSNumber *int_minus_one(NSNumber *cur)