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

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 5ba383e3c3bad835251e24fc97dc35fa47870145..29c30397a598b959fe5e3293a5965d9bb7b821c1 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -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));

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 14b660afe3491e0795b550137c7ed5e4f7758f6e..cd5b22c68101a9e0425b6bed789742c93e7b7a62 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -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)

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 1f683ae6cd697707f9791f59ba214fce93699530..68f9b1b4c7fd5ee60a778c968d0f7c47b83667f1 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -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;