projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update AUI floating windows position and not just size on resize.
[wxWidgets.git]
/
src
/
cocoa
/
dialog.mm
diff --git
a/src/cocoa/dialog.mm
b/src/cocoa/dialog.mm
index f8d3faeafbb1ba137ed124987f90dc8b09c38aca..9c2be1a64fec2a949afa99364479c8fccbc01a77 100644
(file)
--- a/
src/cocoa/dialog.mm
+++ b/
src/cocoa/dialog.mm
@@
-57,13
+57,9
@@
bool wxDialog::Create(wxWindow *parent, wxWindowID winid,
if (parent)
parent->AddChild(this);
if (parent)
parent->AddChild(this);
-
NSRect cocoaRect = NSMakeRect(300,300,200,200
);
+
unsigned int cocoaStyle = NSWindowStyleForWxStyle(style
);
- unsigned int cocoaStyle = 0;
- cocoaStyle |= NSTitledWindowMask;
- cocoaStyle |= NSClosableWindowMask;
- cocoaStyle |= NSMiniaturizableWindowMask;
- cocoaStyle |= NSResizableWindowMask;
+ NSRect cocoaRect = MakeInitialNSWindowContentRect(pos,size,cocoaStyle);
m_cocoaNSWindow = NULL;
SetNSPanel([[NSPanel alloc] initWithContentRect:cocoaRect styleMask:cocoaStyle backing:NSBackingStoreBuffered defer:NO]);
m_cocoaNSWindow = NULL;
SetNSPanel([[NSPanel alloc] initWithContentRect:cocoaRect styleMask:cocoaStyle backing:NSBackingStoreBuffered defer:NO]);
@@
-103,6
+99,10
@@
bool wxDialog::Show(bool show)
if(show)
{
wxAutoNSAutoreleasePool pool;
if(show)
{
wxAutoNSAutoreleasePool pool;
+
+ if (CanDoLayoutAdaptation())
+ DoLayoutAdaptation();
+
InitDialog();
if(IsModal())
{ // ShowModal() will show the dialog
InitDialog();
if(IsModal())
{ // ShowModal() will show the dialog