Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed duplicate WM line from motif/frame.cpp

Browse Source 
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:
Julian Smart
2002-03-14 10:21:07 +00:00
parent 1a6a6043f7
commit 16e8bf31bb
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
samples/minimal/minimal.cpp
View File

@@ -61,7 +61,8 @@ class MyFrame : public wxFrame
{
public:
// 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)
void OnQuit(wxCommandEvent& event);
@@ -137,8 +138,8 @@ bool MyApp::OnInit()
// ----------------------------------------------------------------------------
// frame constructor
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
: wxFrame(NULL, -1, title, pos, size)
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
: wxFrame(NULL, -1, title, pos, size, style)
{
// set the frame icon
SetIcon(wxICON(mondrian));

2
src/motif/frame.cpp
View File

@@ -304,8 +304,6 @@ bool wxFrame::Create(wxWindow *parent,
decor |= MWM_DECOR_TITLE;
if (style & wxTHICK_FRAME)
decor |= MWM_DECOR_BORDER;
if (style & wxTHICK_FRAME)
decor |= MWM_DECOR_BORDER;
if (style & wxMINIMIZE_BOX)
decor |= MWM_DECOR_MINIMIZE;
if (style & wxMAXIMIZE_BOX)

2
src/x11/toplevel.cpp
View File

@@ -511,7 +511,7 @@ bool wxSetWMDecorations(Window w, long style)
hints.decorations |= MWM_DECOR_TITLE;
}
if ((style & wxTHICK_FRAME) || (style & wxSIMPLE_BORDER) || (style & wxCAPTION))
if ((style & wxTHICK_FRAME) || (style & wxCAPTION))
{
// wxLogDebug("MWM_DECOR_BORDER");
hints.flags |= MWM_HINTS_DECORATIONS;