Made wxBORDER_THEME the same as wxBORDER_DEFAULT

Moved wxControl::GetBorderStyle into wxWindowMSW::GetBorderStyle
but added GetBorderStyle to have the same behaviour as before (so e.g.
notebook panels don't get borders)
Improved help window borders

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 43c15e50f30cf99e4d90e651d70dfa91ee36d10e..c8f84b7ef4d8b14d4a8129a504a02d5db2c0e896 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1407,7 +1407,7 @@ enum wxBorder
     wxBORDER_RAISED = 0x04000000,
     wxBORDER_SUNKEN = 0x08000000,
     wxBORDER_DOUBLE = 0x10000000, /* deprecated */
     wxBORDER_RAISED = 0x04000000,
     wxBORDER_SUNKEN = 0x08000000,
     wxBORDER_DOUBLE = 0x10000000, /* deprecated */

-    wxBORDER_THEME  = 0x10000000,
+    wxBORDER_THEME  = wxBORDER_DEFAULT,

 
     /*  a mask to extract border style from the combination of flags */
     wxBORDER_MASK   = 0x1f200000
 
     /*  a mask to extract border style from the combination of flags */
     wxBORDER_MASK   = 0x1f200000

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index ae5e74e8292dd1ed6b0a0e798d62c33c7ad7e473..cbda3af503ac047261f6b30a14884bece0dc8661 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -79,6 +79,8 @@ public:
     virtual bool IsCanvasWindow() const { return true; }
 #endif
 
     virtual bool IsCanvasWindow() const { return true; }
 #endif
 

+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxWindowBase::GetDefaultBorder(); }

 
     WX_DECLARE_CONTROL_CONTAINER();
 
 
     WX_DECLARE_CONTROL_CONTAINER();
 

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index a2e56f715996d1b49f0f34588d136561a7d914e5..a8ee1e5075ab6726037b576dae4bffa226d6191e 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -72,9 +72,6 @@ public:
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 protected:
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 protected:

-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const;
-

     // return default best size (doesn't really make any sense, override this)
     virtual wxSize DoGetBestSize() const;
 
     // return default best size (doesn't really make any sense, override this)
     virtual wxSize DoGetBestSize() const;
 

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 2b56566a73b4623e952da2afa3fbfcde3034a3f3..cd55625acd56b42b2d4fb2cff8550b605f6e5824 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -438,6 +438,9 @@ public:
     // wxControl
     virtual wxBorder GetDefaultBorderForControl() const;
 
     // wxControl
     virtual wxBorder GetDefaultBorderForControl() const;
 

+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const;
+

     // synthesize a wxEVT_LEAVE_WINDOW event and set m_mouseInWindow to false
     void GenerateMouseLeave();
 
     // synthesize a wxEVT_LEAVE_WINDOW event and set m_mouseInWindow to false
     void GenerateMouseLeave();
 

diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index e14ecb7105f1029e4dd1f39ee40c979a050d64be..4642854190ca88fe3398c056bfa995b1e5e46fef 100644 (file)
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -108,8 +108,9 @@ class wxHtmlHelpHashData : public wxObject
 class wxHtmlHelpHtmlWindow : public wxHtmlWindow
 {
 public:
 class wxHtmlHelpHtmlWindow : public wxHtmlWindow
 {
 public:

-    wxHtmlHelpHtmlWindow(wxHtmlHelpWindow *win, wxWindow *parent)
-        : wxHtmlWindow(parent), m_Window(win)
+    wxHtmlHelpHtmlWindow(wxHtmlHelpWindow *win, wxWindow *parent, wxWindowID id = wxID_ANY,
+                         const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, long style = wxHW_DEFAULT_STYLE)
+        : wxHtmlWindow(parent, id, pos, sz, style), m_Window(win)

     {
         SetStandardFonts();
     }
     {
         SetStandardFonts();
     }


@@ -361,6 +362,14 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id,
 
     wxSizer *navigSizer = NULL;
 
 
     wxSizer *navigSizer = NULL;
 

+#ifdef __WXMSW__
+    wxBorder htmlWindowBorder = GetDefaultBorder();
+    if (htmlWindowBorder == wxBORDER_SUNKEN)
+       htmlWindowBorder = wxBORDER_SIMPLE;
+#else
+    wxBorder htmlWindowBorder = wxBORDER_SIMPLE;
+#endif
+

     if (helpStyle & (wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH))
     {
         // traditional help controller; splitter window with html page on the
     if (helpStyle & (wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH))
     {
         // traditional help controller; splitter window with html page on the


@@ -369,7 +378,7 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id,
 
         topWindowSizer->Add(m_Splitter, 1, wxEXPAND);
 
 
         topWindowSizer->Add(m_Splitter, 1, wxEXPAND);
 

-        m_HtmlWin = new wxHtmlHelpHtmlWindow(this, m_Splitter);
+        m_HtmlWin = new wxHtmlHelpHtmlWindow(this, m_Splitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_DEFAULT_STYLE|htmlWindowBorder);

         m_NavigPan = new wxPanel(m_Splitter, wxID_ANY);
         m_NavigNotebook = new wxNotebook(m_NavigPan, wxID_HTML_NOTEBOOK,
                                          wxDefaultPosition, wxDefaultSize);
         m_NavigPan = new wxPanel(m_Splitter, wxID_ANY);
         m_NavigNotebook = new wxNotebook(m_NavigPan, wxID_HTML_NOTEBOOK,
                                          wxDefaultPosition, wxDefaultSize);


@@ -382,7 +391,7 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id,
     else
     {
         // only html window, no notebook with index,contents etc
     else
     {
         // only html window, no notebook with index,contents etc

-        m_HtmlWin = new wxHtmlWindow(this);
+        m_HtmlWin = new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_DEFAULT_STYLE|htmlWindowBorder);

         topWindowSizer->Add(m_HtmlWin, 1, wxEXPAND);
     }
 
         topWindowSizer->Add(m_HtmlWin, 1, wxEXPAND);
     }
 

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 2f1ae919e766a43d58a4bc5eb01a9eb1e2b2ca0c..272ef5b7017da5544344821d5cc811f2162fb757 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -226,11 +226,6 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
 // various accessors
 // ----------------------------------------------------------------------------
 
 // various accessors
 // ----------------------------------------------------------------------------
 

-wxBorder wxControl::GetDefaultBorder() const
-{
-       return GetDefaultBorderForControl();
-}
-

 WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long msStyle = wxWindow::MSWGetStyle(style, exstyle);
 WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long msStyle = wxWindow::MSWGetStyle(style, exstyle);

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index e177b1a1208b55d4f719dbdb06d65135a026c768..99bb37b398eac7a24c7f5ee99c11676516df9fa1 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1286,6 +1286,11 @@ void wxWindowMSW::MSWUpdateStyle(long flagsOld, long exflagsOld)
     }
 }
 
     }
 }
 

+wxBorder wxWindowMSW::GetDefaultBorder() const
+{
+       return GetDefaultBorderForControl();
+}
+

 wxBorder wxWindowMSW::GetDefaultBorderForControl() const
 {
     // we want to automatically give controls a sunken style (confusingly,
 wxBorder wxWindowMSW::GetDefaultBorderForControl() const
 {
     // we want to automatically give controls a sunken style (confusingly,


@@ -1354,14 +1359,11 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
 
         switch ( border )
         {
 
         switch ( border )
         {

-            default:
-            case wxBORDER_DEFAULT:
-                wxFAIL_MSG( _T("unknown border style") );
-                // fall through
+            case wxBORDER_DEFAULT: // also wxBORDER_THEME
+                break;

 
             case wxBORDER_NONE:
             case wxBORDER_SIMPLE:
 
             case wxBORDER_NONE:
             case wxBORDER_SIMPLE:

-            case wxBORDER_THEME:

                 break;
 
             case wxBORDER_STATIC:
                 break;
 
             case wxBORDER_STATIC:


@@ -1377,6 +1379,10 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
                 style &= ~WS_BORDER;
                 break;
 
                 style &= ~WS_BORDER;
                 break;
 

+            default:
+                wxFAIL_MSG( _T("unknown border style") );
+                break;
+

 //            case wxBORDER_DOUBLE:
 //                *exstyle |= WS_EX_DLGMODALFRAME;
 //                break;
 //            case wxBORDER_DOUBLE:
 //                *exstyle |= WS_EX_DLGMODALFRAME;
 //                break;