projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the correct window as parent of wxInfoBar close button.
[wxWidgets.git]
/
src
/
osx
/
cocoa
/
notebook.mm
diff --git
a/src/osx/cocoa/notebook.mm
b/src/osx/cocoa/notebook.mm
index d4acf6b3200614d15227663cbed8f7d85781798f..ff4e70b7c7da5bbf088dd81828285915c709365c 100644
(file)
--- a/
src/osx/cocoa/notebook.mm
+++ b/
src/osx/cocoa/notebook.mm
@@
-4,7
+4,7
@@
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
-// RCS-ID: $Id
: notebmac.cpp 55079 2008-08-13 14:56:42Z PC
$
+// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@
-30,7
+30,7
@@
// controller
//
// controller
//
-@interface wxTabViewController : NSObject
+@interface wxTabViewController : NSObject
wxOSX_10_6_AND_LATER(<NSTabViewDelegate>)
{
}
{
}
@@
-41,43
+41,40
@@
@interface wxNSTabView : NSTabView
{
@interface wxNSTabView : NSTabView
{
- wxWidgetCocoaImpl* impl;
}
}
-- (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation;
-- (wxWidgetCocoaImpl*) implementation;
-- (BOOL) isFlipped;
-
@end
@implementation wxTabViewController
- (id) init
{
@end
@implementation wxTabViewController
- (id) init
{
- [super init];
+
self =
[super init];
return self;
}
- (BOOL)tabView:(NSTabView *)tabView shouldSelectTabViewItem:(NSTabViewItem *)tabViewItem
{
return self;
}
- (BOOL)tabView:(NSTabView *)tabView shouldSelectTabViewItem:(NSTabViewItem *)tabViewItem
{
+ wxUnusedVar(tabViewItem);
wxNSTabView* view = (wxNSTabView*) tabView;
wxNSTabView* view = (wxNSTabView*) tabView;
- wxWidgetCocoaImpl* viewimpl = [view implementation];
+ wxWidgetCocoaImpl* viewimpl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( view );
+
if ( viewimpl )
{
if ( viewimpl )
{
- wxNotebook* wxpeer = (wxNotebook*) viewimpl->GetWXPeer();
+
//
wxNotebook* wxpeer = (wxNotebook*) viewimpl->GetWXPeer();
}
return YES;
}
}
return YES;
}
-- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem;
-
+- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem
{
{
+ wxUnusedVar(tabViewItem);
wxNSTabView* view = (wxNSTabView*) tabView;
wxNSTabView* view = (wxNSTabView*) tabView;
- wxWidgetCocoaImpl* viewimpl =
[view implementation]
;
+ wxWidgetCocoaImpl* viewimpl =
(wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( view )
;
if ( viewimpl )
{
wxNotebook* wxpeer = (wxNotebook*) viewimpl->GetWXPeer();
if ( viewimpl )
{
wxNotebook* wxpeer = (wxNotebook*) viewimpl->GetWXPeer();
- wxpeer->HandleClicked(0);
+ wxpeer->
OSX
HandleClicked(0);
}
}
}
}
@@
-85,19
+82,14
@@
@implementation wxNSTabView
@implementation wxNSTabView
-- (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation
-{
- impl = theImplementation;
-}
-
-- (wxWidgetCocoaImpl*) implementation
-{
- return impl;
-}
-
-- (BOOL) isFlipped
++ (void)initialize
{
{
- return YES;
+ static BOOL initialized = NO;
+ if (!initialized)
+ {
+ initialized = YES;
+ wxOSXCocoaClassAddWXMethods( self );
+ }
}
@end
}
@end
@@
-108,18
+100,18
@@
public:
wxCocoaTabView( wxWindowMac* peer , WXWidget w ) : wxWidgetCocoaImpl(peer, w)
{
}
wxCocoaTabView( wxWindowMac* peer , WXWidget w ) : wxWidgetCocoaImpl(peer, w)
{
}
-
- void GetContentArea( int &left , int &top , int &width , int &height ) const
+
+ void GetContentArea( int &left , int &top , int &width , int &height ) const
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
NSRect r = [slf contentRect];
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
NSRect r = [slf contentRect];
- left = r.origin.x;
- top = r.origin.y;
- width = r.size.width;
- height = r.size.height;
+ left =
(int)
r.origin.x;
+ top =
(int)
r.origin.y;
+ width =
(int)
r.size.width;
+ height =
(int)
r.size.height;
}
}
-
- void SetValue( wxInt32 value )
+
+ void SetValue( wxInt32 value )
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
// avoid 'changed' events when setting the tab programmatically
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
// avoid 'changed' events when setting the tab programmatically
@@
-128,7
+120,7
@@
public:
[slf selectTabViewItemAtIndex:(value-1)];
[slf setDelegate:controller];
}
[slf selectTabViewItemAtIndex:(value-1)];
[slf setDelegate:controller];
}
-
+
wxInt32 GetValue() const
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
wxInt32 GetValue() const
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
@@
-138,7
+130,7
@@
public:
else
return [slf indexOfTabViewItem:selectedItem]+1;
}
else
return [slf indexOfTabViewItem:selectedItem]+1;
}
-
+
void SetMaximum( wxInt32 maximum )
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
void SetMaximum( wxInt32 maximum )
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
@@
-146,7
+138,7
@@
public:
// avoid 'changed' events when setting the tab programmatically
wxTabViewController* controller = [slf delegate];
[slf setDelegate:nil];
// avoid 'changed' events when setting the tab programmatically
wxTabViewController* controller = [slf delegate];
[slf setDelegate:nil];
-
+
if ( maximum > cocoacount )
{
for ( int i = cocoacount ; i < maximum ; ++i )
if ( maximum > cocoacount )
{
for ( int i = cocoacount ; i < maximum ; ++i )
@@
-170,9
+162,9
@@
public:
void SetupTabs( const wxNotebook& notebook)
{
int pcount = notebook.GetPageCount();
void SetupTabs( const wxNotebook& notebook)
{
int pcount = notebook.GetPageCount();
-
+
SetMaximum( pcount );
SetMaximum( pcount );
-
+
for ( int i = 0 ; i < pcount ; ++i )
{
wxNotebookPage* page = notebook.GetPage(i);
for ( int i = 0 ; i < pcount ; ++i )
{
wxNotebookPage* page = notebook.GetPage(i);
@@
-183,7
+175,7
@@
public:
if ( notebook.GetImageList() && notebook.GetPageImage(i) >= 0 )
{
const wxBitmap bmap = notebook.GetImageList()->GetBitmap( notebook.GetPageImage( i ) ) ;
if ( notebook.GetImageList() && notebook.GetPageImage(i) >= 0 )
{
const wxBitmap bmap = notebook.GetImageList()->GetBitmap( notebook.GetPageImage( i ) ) ;
- if ( bmap.Ok() )
+ if ( bmap.
Is
Ok() )
{
// TODO how to set an image on a tab
}
{
// TODO how to set an image on a tab
}
@@
-229,17
+221,17
@@
public:
m_peer = new wxMacControl( this );
OSStatus err = CreateTabsControl(
MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
m_peer = new wxMacControl( this );
OSStatus err = CreateTabsControl(
MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
- tabsize, tabstyle, 0, NULL,
m_peer
->GetControlRefAddr() );
+ tabsize, tabstyle, 0, NULL,
GetPeer()
->GetControlRefAddr() );
verify_noerr( err );
#endif
*/
verify_noerr( err );
#endif
*/
-wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
- wxWindowMac*
parent,
- wxWindowID
id,
- const wxPoint& pos,
+wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
+ wxWindowMac*
WXUNUSED(parent),
+ wxWindowID
WXUNUSED(id),
+ const wxPoint& pos,
const wxSize& size,
const wxSize& size,
- long style,
- long
extraStyle
)
+ long style,
+ long
WXUNUSED(extraStyle)
)
{
static wxTabViewController* controller = NULL;
{
static wxTabViewController* controller = NULL;
@@
-247,7
+239,7
@@
wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
controller =[[wxTabViewController alloc] init];
NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
controller =[[wxTabViewController alloc] init];
NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
-
+
NSTabViewType tabstyle = NSTopTabsBezelBorder;
if ( style & wxBK_LEFT )
tabstyle = NSLeftTabsBezelBorder;
NSTabViewType tabstyle = NSTopTabsBezelBorder;
if ( style & wxBK_LEFT )
tabstyle = NSLeftTabsBezelBorder;
@@
-255,11
+247,10
@@
wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
tabstyle = NSRightTabsBezelBorder;
else if ( style & wxBK_BOTTOM )
tabstyle = NSBottomTabsBezelBorder;
tabstyle = NSRightTabsBezelBorder;
else if ( style & wxBK_BOTTOM )
tabstyle = NSBottomTabsBezelBorder;
-
+
wxNSTabView* v = [[wxNSTabView alloc] initWithFrame:r];
[v setTabViewType:tabstyle];
wxWidgetCocoaImpl* c = new wxCocoaTabView( wxpeer, v );
wxNSTabView* v = [[wxNSTabView alloc] initWithFrame:r];
[v setTabViewType:tabstyle];
wxWidgetCocoaImpl* c = new wxCocoaTabView( wxpeer, v );
- [v setImplementation:c];
[v setDelegate: controller];
return c;
}
[v setDelegate: controller];
return c;
}