wxMiniFrame's default style is without closebox on

    wxGTK and wxMSW, and now on wxMAC as well.
  Document that.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/minifram.tex b/docs/latex/wx/minifram.tex
index c58c0002d068cbaf8b3ea9d4c22b9c61e79a7469..ac6cd8d9a2ab762393bee026ce672265d8bf0e96 100644 (file)
--- a/docs/latex/wx/minifram.tex
+++ b/docs/latex/wx/minifram.tex
@@ -20,7 +20,6 @@ take up too much screen area.
 \begin{twocollist}\itemsep=0pt
 \twocolitem{\windowstyle{wxICONIZE}}{Display the frame iconized (minimized) (Windows only).}
 \twocolitem{\windowstyle{wxCAPTION}}{Puts a caption on the frame.}
-\twocolitem{\windowstyle{wxDEFAULT\_FRAME\_STYLE}}{Defined as {\bf wxMINIMIZE\_BOX \pipe wxMAXIMIZE\_BOX \pipe wxTHICK\_FRAME \pipe wxSYSTEM\_MENU \pipe wxCAPTION \pipe wxCLOSE\_BOX}.}
 \twocolitem{\windowstyle{wxMINIMIZE}}{Identical to {\bf wxICONIZE}.}
 \twocolitem{\windowstyle{wxMINIMIZE\_BOX}}{Displays a minimize box on the frame (Windows and Motif only).}
 \twocolitem{\windowstyle{wxMAXIMIZE}}{Displays the frame maximized (Windows only).}
@@ -56,7 +55,7 @@ Default constructor.
 
 \func{}{wxMiniFrame}{\param{wxWindow* }{parent}, \param{wxWindowID }{id},\rtfsp
 \param{const wxString\& }{title}, \param{const wxPoint\&}{ pos = wxDefaultPosition},\rtfsp
-\param{const wxSize\&}{ size = wxDefaultSize}, \param{long}{ style = wxDEFAULT\_FRAME\_STYLE},\rtfsp
+\param{const wxSize\&}{ size = wxDefaultSize}, \param{long}{ style = wxCAPTION | wxRESIZE\_BORDER},\rtfsp
 \param{const wxString\& }{name = ``frame"}}
 
 Constructor, creating the window.
@@ -100,7 +99,7 @@ Destructor. Destroys all child windows and menu bar if present.
 
 \func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id},\rtfsp
 \param{const wxString\& }{title}, \param{const wxPoint\&}{ pos = wxDefaultPosition},\rtfsp
-\param{const wxSize\&}{ size = wxDefaultSize}, \param{long}{ style = wxDEFAULT\_FRAME\_STYLE},\rtfsp
+\param{const wxSize\&}{ size = wxDefaultSize}, \param{long}{ style = wxCAPTION | wxRESIZE\_BORDER},\rtfsp
 \param{const wxString\& }{name = ``frame"}}
 
 Used in two-step frame construction. See \helpref{wxMiniFrame::wxMiniFrame}{wxminiframector}\rtfsp

diff --git a/include/wx/mac/carbon/minifram.h b/include/wx/mac/carbon/minifram.h
index 4ef85c5356d248a0c35ea2e9b0689dd0dab14eaf..6d00c918ecae5eb91958040dd0e22b5aa0210693 100644 (file)
--- a/include/wx/mac/carbon/minifram.h
+++ b/include/wx/mac/carbon/minifram.h
@@ -27,7 +27,7 @@ public:
            const wxString& title,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION_HORIZ,
+           long style = wxCAPTION | wxRESIZE_BORDER | wxTINY_CAPTION_HORIZ,
            const wxString& name = wxFrameNameStr)
   {
       // Use wxFrame constructor in absence of more specific code.