Removed duplicate WM line from motif/frame.cpp
Added window style to minimal sample Failed attempt to get border-only toplevel window style git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -61,7 +61,8 @@ class MyFrame : public wxFrame
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
// ctor(s)
|
// ctor(s)
|
||||||
MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
|
MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
|
||||||
|
long style = wxDEFAULT_FRAME_STYLE);
|
||||||
|
|
||||||
// event handlers (these functions should _not_ be virtual)
|
// event handlers (these functions should _not_ be virtual)
|
||||||
void OnQuit(wxCommandEvent& event);
|
void OnQuit(wxCommandEvent& event);
|
||||||
@@ -137,8 +138,8 @@ bool MyApp::OnInit()
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
// frame constructor
|
// frame constructor
|
||||||
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
|
||||||
: wxFrame(NULL, -1, title, pos, size)
|
: wxFrame(NULL, -1, title, pos, size, style)
|
||||||
{
|
{
|
||||||
// set the frame icon
|
// set the frame icon
|
||||||
SetIcon(wxICON(mondrian));
|
SetIcon(wxICON(mondrian));
|
||||||
|
@@ -304,8 +304,6 @@ bool wxFrame::Create(wxWindow *parent,
|
|||||||
decor |= MWM_DECOR_TITLE;
|
decor |= MWM_DECOR_TITLE;
|
||||||
if (style & wxTHICK_FRAME)
|
if (style & wxTHICK_FRAME)
|
||||||
decor |= MWM_DECOR_BORDER;
|
decor |= MWM_DECOR_BORDER;
|
||||||
if (style & wxTHICK_FRAME)
|
|
||||||
decor |= MWM_DECOR_BORDER;
|
|
||||||
if (style & wxMINIMIZE_BOX)
|
if (style & wxMINIMIZE_BOX)
|
||||||
decor |= MWM_DECOR_MINIMIZE;
|
decor |= MWM_DECOR_MINIMIZE;
|
||||||
if (style & wxMAXIMIZE_BOX)
|
if (style & wxMAXIMIZE_BOX)
|
||||||
|
@@ -511,7 +511,7 @@ bool wxSetWMDecorations(Window w, long style)
|
|||||||
hints.decorations |= MWM_DECOR_TITLE;
|
hints.decorations |= MWM_DECOR_TITLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((style & wxTHICK_FRAME) || (style & wxSIMPLE_BORDER) || (style & wxCAPTION))
|
if ((style & wxTHICK_FRAME) || (style & wxCAPTION))
|
||||||
{
|
{
|
||||||
// wxLogDebug("MWM_DECOR_BORDER");
|
// wxLogDebug("MWM_DECOR_BORDER");
|
||||||
hints.flags |= MWM_HINTS_DECORATIONS;
|
hints.flags |= MWM_HINTS_DECORATIONS;
|
||||||
|
Reference in New Issue
Block a user