Darwin has commandline args.
Position controls right under Mac. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -661,9 +661,10 @@ int wxEntry( int argc, char *argv[] , bool enterLoop )
|
|||||||
|
|
||||||
wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
|
wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
|
||||||
|
|
||||||
#ifdef __WXMAC__
|
#ifndef __DARWIN__
|
||||||
argc = 0 ; // currently we don't support files as parameters
|
argc = 0 ; // currently we don't support files as parameters
|
||||||
#endif
|
#endif
|
||||||
|
// we could try to get the open apple events here to adjust argc and argv better
|
||||||
|
|
||||||
wxTheApp->argc = argc;
|
wxTheApp->argc = argc;
|
||||||
wxTheApp->argv = argv;
|
wxTheApp->argv = argv;
|
||||||
@@ -671,8 +672,6 @@ int wxEntry( int argc, char *argv[] , bool enterLoop )
|
|||||||
// GUI-specific initialization, such as creating an app context.
|
// GUI-specific initialization, such as creating an app context.
|
||||||
wxEntryInitGui();
|
wxEntryInitGui();
|
||||||
|
|
||||||
// we could try to get the open apple events here to adjust argc and argv better
|
|
||||||
|
|
||||||
|
|
||||||
// Here frames insert themselves automatically
|
// Here frames insert themselves automatically
|
||||||
// into wxTopLevelWindows by getting created
|
// into wxTopLevelWindows by getting created
|
||||||
|
@@ -661,9 +661,10 @@ int wxEntry( int argc, char *argv[] , bool enterLoop )
|
|||||||
|
|
||||||
wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
|
wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
|
||||||
|
|
||||||
#ifdef __WXMAC__
|
#ifndef __DARWIN__
|
||||||
argc = 0 ; // currently we don't support files as parameters
|
argc = 0 ; // currently we don't support files as parameters
|
||||||
#endif
|
#endif
|
||||||
|
// we could try to get the open apple events here to adjust argc and argv better
|
||||||
|
|
||||||
wxTheApp->argc = argc;
|
wxTheApp->argc = argc;
|
||||||
wxTheApp->argv = argv;
|
wxTheApp->argv = argv;
|
||||||
@@ -671,8 +672,6 @@ int wxEntry( int argc, char *argv[] , bool enterLoop )
|
|||||||
// GUI-specific initialization, such as creating an app context.
|
// GUI-specific initialization, such as creating an app context.
|
||||||
wxEntryInitGui();
|
wxEntryInitGui();
|
||||||
|
|
||||||
// we could try to get the open apple events here to adjust argc and argv better
|
|
||||||
|
|
||||||
|
|
||||||
// Here frames insert themselves automatically
|
// Here frames insert themselves automatically
|
||||||
// into wxTopLevelWindows by getting created
|
// into wxTopLevelWindows by getting created
|
||||||
|
@@ -547,7 +547,7 @@ void wxControl::DoSetSize(int x, int y,
|
|||||||
if (height == -1) new_height = size.y;
|
if (height == -1) new_height = size.y;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
AdjustForParentClientOrigin(new_x, new_y, sizeFlags);
|
// AdjustForParentClientOrigin(new_x, new_y, sizeFlags);
|
||||||
|
|
||||||
mac_x = new_x;
|
mac_x = new_x;
|
||||||
mac_y = new_y;
|
mac_y = new_y;
|
||||||
|
@@ -547,7 +547,7 @@ void wxControl::DoSetSize(int x, int y,
|
|||||||
if (height == -1) new_height = size.y;
|
if (height == -1) new_height = size.y;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
AdjustForParentClientOrigin(new_x, new_y, sizeFlags);
|
// AdjustForParentClientOrigin(new_x, new_y, sizeFlags);
|
||||||
|
|
||||||
mac_x = new_x;
|
mac_x = new_x;
|
||||||
mac_y = new_y;
|
mac_y = new_y;
|
||||||
|
Reference in New Issue
Block a user