X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b781a6729859abc77e6ca5b1f81cbaad974a78f..8e8d3ba8e5b432f0ebe77785fa12a032001b5e23:/src/mac/window.cpp diff --git a/src/mac/window.cpp b/src/mac/window.cpp index 9d98f35302..6c4f516f71 100644 --- a/src/mac/window.cpp +++ b/src/mac/window.cpp @@ -23,6 +23,8 @@ #include "wx/layout.h" #include "wx/dialog.h" #include "wx/listbox.h" +#include "wx/scrolbar.h" +#include "wx/statbox.h" #include "wx/button.h" #include "wx/settings.h" #include "wx/msgdlg.h" @@ -31,7 +33,7 @@ #include "wx/tabctrl.h" #include "wx/tooltip.h" // TODO remove the line below, just for lookup-up convenience CS -#include "wx/mac/window.h" +#include "wx/window.h" #include "wx/menuitem.h" #include "wx/log.h" @@ -999,8 +1001,8 @@ void wxWindow::MacCreateRealWindow( const wxString& title, // translate the window attributes in the appropriate window class and attributes - WindowClass wclass ; - WindowAttributes attr ; + WindowClass wclass = 0; + WindowAttributes attr = kWindowNoAttributes ; if ( HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT) ) { @@ -1037,8 +1039,6 @@ void wxWindow::MacCreateRealWindow( const wxString& title, wclass = kModalWindowClass ; } - attr = kWindowNoAttributes ; - if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ) { attr |= kWindowFullZoomAttribute ;