projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adding the GetEventHandler() indirection
[wxWidgets.git]
/
src
/
cocoa
/
statline2.mm
diff --git
a/src/cocoa/statline2.mm
b/src/cocoa/statline2.mm
index 6afc341f54c869d2d313a19da57ee7befa736f06..2f5c95149cfd29a1adbca29c11b9aa14f452df07 100644
(file)
--- a/
src/cocoa/statline2.mm
+++ b/
src/cocoa/statline2.mm
@@
-4,15
+4,20
@@
// Author: David Elliott
// Modified by:
// Created: 2003/02/15
// Author: David Elliott
// Modified by:
// Created: 2003/02/15
-// RCS-ID: $Id
:
+// RCS-ID: $Id
$
// Copyright: (c) 2003 David Elliott
// Copyright: (c) 2003 David Elliott
-// Licence:
wxWindows licens
e
+// Licence:
wxWidgets licenc
e
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#include "wx/app.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+#endif //WX_PRECOMP
#include "wx/statline.h"
#include "wx/statline.h"
-#import <AppKit/NSView.h>
+#include "wx/cocoa/autorelease.h"
+
+#import <AppKit/NSBox.h>
IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
BEGIN_EVENT_TABLE(wxStaticLine, wxStaticLineBase)
IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
BEGIN_EVENT_TABLE(wxStaticLine, wxStaticLineBase)
@@
-25,12
+30,16
@@
bool wxStaticLine::Create(wxWindow *parent, wxWindowID winid,
long style,
const wxString& name)
{
long style,
const wxString& name)
{
+ wxAutoNSAutoreleasePool pool;
if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
return false;
if(!CreateControl(parent,winid,pos,size,style,wxDefaultValidator,name))
return false;
- SetNSView([[NS
View alloc] initWithFrame: NSMakeRect(10,10,20,20
)]);
+ SetNSView([[NS
Box alloc] initWithFrame: MakeDefaultNSRect(size
)]);
[m_cocoaNSView release];
[m_cocoaNSView release];
+ [(NSBox*)m_cocoaNSView setBoxType: NSBoxSeparator];
if(m_parent)
m_parent->CocoaAddChild(this);
if(m_parent)
m_parent->CocoaAddChild(this);
+ SetInitialFrameRect(pos,size);
+
return true;
}
return true;
}