More border rationalisation. GetDefaultBorder is now mostly defined in base class...

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

diff --git a/include/wx/aui/auibook.h b/include/wx/aui/auibook.h
index 618e42af7cb3b4505262510c005cfd75fbb67f23..51632fbd7eb710f7c9ac55b57f5bff9d0c38b03f 100644 (file)
--- a/include/wx/aui/auibook.h
+++ b/include/wx/aui/auibook.h
@@ -455,6 +455,8 @@ public:
     bool IsDragging() const { return m_is_dragging; }
 
 protected:
     bool IsDragging() const { return m_is_dragging; }
 
 protected:

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

 
     void OnPaint(wxPaintEvent& evt);
     void OnEraseBackground(wxEraseEvent& evt);
 
     void OnPaint(wxPaintEvent& evt);
     void OnEraseBackground(wxEraseEvent& evt);


@@ -580,6 +582,8 @@ public:
     // virtual bool AcceptsFocus() const { return false; }
 
 protected:
     // virtual bool AcceptsFocus() const { return false; }
 
 protected:

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

 
     // these can be overridden
     virtual void UpdateTabCtrlHeight();
 
     // these can be overridden
     virtual void UpdateTabCtrlHeight();

diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index 15dd227715d3cf27ac11c4e4d1867c0af3073728..60ceefc8554bbef470ba25280bb2ac1790a58dab 100644 (file)
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -243,6 +243,9 @@ protected:
         SetSelection_SendEvent = 1
     };
 
         SetSelection_SendEvent = 1
     };
 

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

     // set the selection to the given page, sending the events (which can
     // possibly prevent the page change from taking place) if SendEvent flag is
     // included
     // set the selection to the given page, sending the events (which can
     // possibly prevent the page change from taking place) if SendEvent flag is
     // included

diff --git a/include/wx/button.h b/include/wx/button.h
index bf32419366c35d8969677f2dcfce0a51af393885..58f8ab55fe4fb9058e863729558c98149ebf28a4 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -78,6 +78,9 @@ public:
     static wxSize GetDefaultSize();
 
 protected:
     static wxSize GetDefaultSize();
 
 protected:

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

     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };
 

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 47ba77a0e22ad38d81a1aef428f6d7b18ded107b..8b0348fe374dd609f5376a94dd6a8635f573897b 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -118,6 +118,9 @@ public:
     }
 
 protected:
     }
 
 protected:

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

     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
 
     virtual wxCheckBoxState DoGet3StateValue() const
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
 
     virtual wxCheckBoxState DoGet3StateValue() const

diff --git a/include/wx/control.h b/include/wx/control.h
index fcc3b923f82b7de17cabec7e0adac04aa1cb9245..08e9aeceea97d08a872f936af53896283f70c995 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -92,6 +92,9 @@ public:
     virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
 
 protected:
     virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
 
 protected:

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

     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
     // to the list of parents children
     bool CreateControl(wxWindowBase *parent,
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
     // to the list of parents children
     bool CreateControl(wxWindowBase *parent,

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 2156e05a8788d9945ca7e64865adc7d9a28002d1..11605c9d1a14942148c4306c098f936668bb9a07 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -88,6 +88,8 @@ public:
     virtual bool AcceptsFocus() const { return false; }
 
 protected:
     virtual bool AcceptsFocus() const { return false; }
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     // the max position
     int m_rangeMax;
 
     // the max position
     int m_rangeMax;
 

diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h
index 9e0f90ddc16577a15d6cad9fb7317fee1e719592..264b7712824763dacd578f132fb2d81a21f80c62 100644 (file)
--- a/include/wx/hyperlink.h
+++ b/include/wx/hyperlink.h
@@ -69,6 +69,8 @@ public:
     //       wxWindow::Get/SetFont, wxWindow::Get/SetCursor are important !
 
 protected:
     //       wxWindow::Get/SetFont, wxWindow::Get/SetCursor are important !
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     // checks for validity some of the ctor/Create() function parameters
     void CheckParams(const wxString& label, const wxString& url, long style);
 
     // checks for validity some of the ctor/Create() function parameters
     void CheckParams(const wxString& label, const wxString& url, long style);
 

diff --git a/include/wx/mac/carbon/tglbtn.h b/include/wx/mac/carbon/tglbtn.h
index 7031d4a6a9aaa800c3f7ae9e3262591bed08f4f0..b27bdeb59ca34406a9283a3456f516b2cd59e45e 100644 (file)
--- a/include/wx/mac/carbon/tglbtn.h
+++ b/include/wx/mac/carbon/tglbtn.h
@@ -49,6 +49,7 @@ public:
     virtual void Command(wxCommandEvent& event);
 
 protected:
     virtual void Command(wxCommandEvent& event);
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }

     virtual wxSize DoGetBestSize() const;
 
 private:
     virtual wxSize DoGetBestSize() const;
 
 private:

diff --git a/include/wx/motif/tglbtn.h b/include/wx/motif/tglbtn.h
index d6cdadd00938b6247448f8ec3e6e130fdcb4d5b3..0fd827b953934f8621306bbf2d0f844a5dd883e3 100644 (file)
--- a/include/wx/motif/tglbtn.h
+++ b/include/wx/motif/tglbtn.h
@@ -37,6 +37,10 @@ public:
                  long style = 0,
                  const wxValidator& val = wxDefaultValidator,
                  const wxString &name = wxCheckBoxNameStr );
                  long style = 0,
                  const wxValidator& val = wxDefaultValidator,
                  const wxString &name = wxCheckBoxNameStr );

+
+protected:
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

 private:
     DECLARE_DYNAMIC_CLASS(wxToggleButton)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxToggleButton)
 

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index 20d8edb5fd993ac078f00139b3ba5d2408c9472a..402948e08af5e24c0602f27fc16c45cd1caf3778 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -86,6 +86,9 @@ public:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:

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

     // common part of all ctors
     void Init() { m_lastAcceptedSelection = wxID_NONE; }
 
     // common part of all ctors
     void Init() { m_lastAcceptedSelection = wxID_NONE; }
 

diff --git a/include/wx/msw/datectrl.h b/include/wx/msw/datectrl.h
index c5d43d93a2009e682cdcd3fd5ed3af9b7621983f..b92a88ea38b1befa879d9ec1904d8af4f63c4cb4 100644 (file)
--- a/include/wx/msw/datectrl.h
+++ b/include/wx/msw/datectrl.h
@@ -61,6 +61,7 @@ public:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }

     virtual wxSize DoGetBestSize() const;
 
     // the date currently shown by the control, may be invalid
     virtual wxSize DoGetBestSize() const;
 
     // the date currently shown by the control, may be invalid

diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index 5702f1824a32f8fe915a8e85eb79085e8d04168d..08cf96528a69e9978f3d83dc410f0823e100b630 100644 (file)
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -116,9 +116,6 @@ protected:
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;
 
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;
 

-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-

     // the labels windows, if any
     wxSubwindows *m_labels;
 
     // the labels windows, if any
     wxSubwindows *m_labels;
 

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index ba494939a7b641de6aa4f3c0dd0cfdf561c674b1..ba61d269efb904e74a70fc288780f774bc608b7c 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -58,7 +58,6 @@ public:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:

-    virtual wxBorder GetDefaultBorder() const;

     virtual wxSize DoGetBestSize() const;
 
     // ctor/dtor helpers
     virtual wxSize DoGetBestSize() const;
 
     // ctor/dtor helpers

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 8d48ba933e3d8dd4446c21d0e8e636b24bae2a00..e51ede32cfd9f29826daf0edae56a644df7c0d1d 100644 (file)
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -46,9 +46,6 @@ public:
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;
 

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

 #ifndef __WXWINCE__
 public:
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 #ifndef __WXWINCE__
 public:
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 1c05fbf758a4d770aed46038c6d04005ea23f15e..b9c4b6ad2191d5f7c7278580d68462b0686aeb9c 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -44,7 +44,6 @@ public:
 
 protected:
     // implement/override some base class virtuals
 
 protected:
     // implement/override some base class virtuals

-    virtual wxBorder GetDefaultBorder() const;

     virtual void DoSetSize(int x, int y, int w, int h,
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
     virtual void DoSetSize(int x, int y, int w, int h,
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;

diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h
index 02650d58ed7da9cfe0a277da1c8f614e99a81827..8680717340d0c00a9deae7352d7136ef604523e1 100644 (file)
--- a/include/wx/msw/tglbtn.h
+++ b/include/wx/msw/tglbtn.h
@@ -52,8 +52,8 @@ public:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }

     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetBestSize() const;

-    virtual wxBorder GetDefaultBorder() const;

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index c88d22e299f540efcfa8f22b78e94ff6270397bb..cfab751f413f51a51e80aea3c312c21c70d0d9d3 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -448,6 +448,10 @@ protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const;
 
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const;
 

+    // Translate wxBORDER_THEME (and other border styles if necessary to the value
+    // that makes most sense for this Windows environment
+    virtual wxBorder TranslateBorder(wxBorder border) const;
+

 #if wxUSE_MENUS_NATIVE
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 #endif // wxUSE_MENUS_NATIVE
 #if wxUSE_MENUS_NATIVE
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 #endif // wxUSE_MENUS_NATIVE

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 99167e7474ae242f5d358deb1a3703f5464bbd74..14aca4445b102050a1a30e140d9021118d0f8dc6 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -105,6 +105,9 @@ public:
 
 protected:
 
 
 protected:
 

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

     // adjust value according to wxSL_INVERSE style
     virtual int ValueInvertOrNot(int value) const
     {
     // adjust value according to wxSL_INVERSE style
     virtual int ValueInvertOrNot(int value) const
     {

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 24281700b402d7996afc8377ca80428b7fdbff6f..b80459f3ff517192db273ba7c5238761fb69b9d6 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -45,6 +45,9 @@ public:
     virtual bool HasTransparentBackground() { return true; }
 
 protected:
     virtual bool HasTransparentBackground() { return true; }
 
 protected:

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

     virtual wxSize DoGetBestSize() const;
 
     DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
     virtual wxSize DoGetBestSize() const;
 
     DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 039df42af356b4a0dc597941cb6bb5a40c4316f5..7eee31685e5865e01c88ca1b31a2afd9a20ea0de 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -47,6 +47,9 @@ public:
     }
 
 private:
     }
 
 private:

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

     DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
 };
 

diff --git a/include/wx/statline.h b/include/wx/statline.h
index b1046d6d5e72017957c60d1655c51eeafdbacced..87115f6f138e19f0d8ca285e6e24c238d13276b4 100644 (file)
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -50,6 +50,9 @@ public:
     virtual bool AcceptsFocus() const { return false; }
 
 protected:
     virtual bool AcceptsFocus() const { return false; }
 
 protected:

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

     // set the right size for the right dimension
     wxSize AdjustSize(const wxSize& size) const
     {
     // set the right size for the right dimension
     wxSize AdjustSize(const wxSize& size) const
     {

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 05059831bb41531cc24ef37e8fcdbae8f87f3de7..395b19066aa4718e07631b285a6bbf7f38d2e037 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -72,6 +72,9 @@ public:
 
 protected:      // functions required for wxST_ELLIPSIZE_* support
 
 
 protected:      // functions required for wxST_ELLIPSIZE_* support
 

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

     // just calls RemoveMarkup & Ellipsize on the original label.
     virtual wxString GetEllipsizedLabelWithoutMarkup() const;
 
     // just calls RemoveMarkup & Ellipsize on the original label.
     virtual wxString GetEllipsizedLabelWithoutMarkup() const;
 

diff --git a/include/wx/univ/tglbtn.h b/include/wx/univ/tglbtn.h
index 35d3667e0e21b718febab2c654b5efdd13187495..8f78e3a7b86097753b639e6716383e92a3ebc5dd 100644 (file)
--- a/include/wx/univ/tglbtn.h
+++ b/include/wx/univ/tglbtn.h
@@ -57,6 +57,8 @@ public:
     bool GetValue() const { return m_value; }
 
 protected:
     bool GetValue() const { return m_value; }
 
 protected:

+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     // the current value
     bool m_value;
 
     // the current value
     bool m_value;
 

diff --git a/include/wx/window.h b/include/wx/window.h
index d09acb8c5b792d169f34379989d4812df19ffb1f..972fb886b45ca5c53714b166fb27c78415e6ef7b 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1244,7 +1244,8 @@ public:
     // area (normal windows can't, but e.g. menubar or statusbar can):
     virtual bool CanBeOutsideClientArea() const { return false; }
 
     // area (normal windows can't, but e.g. menubar or statusbar can):
     virtual bool CanBeOutsideClientArea() const { return false; }
 

-    // returns true if the platform should explicitly apply a theme border
+    // returns true if the platform should explicitly apply a theme border. Currently
+    // used only by Windows

     virtual bool CanApplyThemeBorder() const { return true; }
 
 protected:
     virtual bool CanApplyThemeBorder() const { return true; }
 
 protected:


@@ -1409,7 +1410,7 @@ protected:
     // this allows you to implement standard control borders without
     // repeating the code in different classes that are not derived from
     // wxControl
     // this allows you to implement standard control borders without
     // repeating the code in different classes that are not derived from
     // wxControl

-    virtual wxBorder GetDefaultBorderForControl() const { return wxBORDER_SUNKEN; }
+    virtual wxBorder GetDefaultBorderForControl() const { return wxBORDER_THEME; }

 
     // Get the default size for the new window if no explicit size given. TLWs
     // have their own default size so this is just for non top-level windows.
 
     // Get the default size for the new window if no explicit size given. TLWs
     // have their own default size so this is just for non top-level windows.

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 3e4fbb119f3a8c2681661ace87cb1df0d859cfa0..83f789b8243ff5180ca36e507d0827f207262db7 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -158,6 +158,12 @@ wxString wxControlBase::RemoveMnemonics(const wxString& str)
     return wxStripMenuCodes(str, wxStrip_Mnemonics);
 }
 
     return wxStripMenuCodes(str, wxStrip_Mnemonics);
 }
 

+wxBorder wxControlBase::GetDefaultBorder() const
+{
+    return wxBORDER_THEME;
+}
+
+

 // ----------------------------------------------------------------------------
 // wxStaticBitmap
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStaticBitmap
 // ----------------------------------------------------------------------------

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 857cc3325be5a15c89d68dc1081766b5a4db71b0..f0d866b275270dfe0117375824a0399d5ac20531 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -245,7 +245,9 @@ wxSize wxControl::DoGetBestSize() const
 
 wxBorder wxControl::GetDefaultBorder() const
 {
 
 wxBorder wxControl::GetDefaultBorder() const
 {

-       return GetDefaultBorderForControl();
+    return wxControlBase::GetDefaultBorder();
+
+//  return GetDefaultBorderForControl();

 }
 
 // This is a helper for all wxControls made with UPDOWN native control.
 }
 
 // This is a helper for all wxControls made with UPDOWN native control.

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index cd03008f89e66d50df44c2d1c863af9ed8b4644f..537c193d847663f98ec2b54b57b339194baaff67 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -171,11 +171,6 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-wxBorder wxStaticBitmap::GetDefaultBorder() const
-{
-    return wxBORDER_NONE;
-}
-

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

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 0d4df55d134be0bcf1fac94128fdca2891fc4bfe..e568f4475de2872161d571a7c17e98b184d2021f 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -138,11 +138,6 @@ bool wxStaticBox::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-wxBorder wxStaticBox::GetDefaultBorder() const
-{
-    return wxBORDER_NONE;
-}
-

 WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle);
 WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle);

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 2df67c28b877ba53c7820930b1f730876c4f481c..a3b52cac708b295275d8efa28bcc9182565aa9ea 100644 (file)
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -100,11 +100,6 @@ bool wxStaticText::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-wxBorder wxStaticText::GetDefaultBorder() const
-{
-    return wxBORDER_NONE;
-}
-

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


@@ -220,9 +215,9 @@ void wxStaticText::SetLabel(const wxString& label)
     if ( HasFlag(wxST_ELLIPSIZE_END) &&
           wxGetOsVersion() == wxOS_WINDOWS_NT )
     {
     if ( HasFlag(wxST_ELLIPSIZE_END) &&
           wxGetOsVersion() == wxOS_WINDOWS_NT )
     {

-        // adding SS_ENDELLIPSIS or SS_ENDELLIPSIS "disables" the correct 
-        // newline handling in static texts: the newlines in the labels are 
-        // shown as square. Thus we don't use it even on newer OS when 
+        // adding SS_ENDELLIPSIS or SS_ENDELLIPSIS "disables" the correct
+        // newline handling in static texts: the newlines in the labels are
+        // shown as square. Thus we don't use it even on newer OS when

         // the static label contains a newline.
         if ( label.Contains(wxT('\n')) )
             styleReal &= ~SS_ENDELLIPSIS;
         // the static label contains a newline.
         if ( label.Contains(wxT('\n')) )
             styleReal &= ~SS_ENDELLIPSIS;

diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp
index 906c430116b868ffc6c16c2313b09b020dea3745..7a0e49c862c76766b01e3eb86500300557419da8 100644 (file)
--- a/src/msw/tglbtn.cpp
+++ b/src/msw/tglbtn.cpp
@@ -83,11 +83,6 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
     return true;
 }
 
     return true;
 }
 

-wxBorder wxToggleButton::GetDefaultBorder() const
-{
-    return wxBORDER_NONE;
-}
-

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 87122d67bdf3295da8ac4daa4d876b90a63d4663..c3b83772f41859620de33b87d3cd0c44184c206d 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1309,9 +1309,38 @@ wxBorder wxWindowMSW::GetDefaultBorderForControl() const
 
 wxBorder wxWindowMSW::GetDefaultBorder() const
 {
 
 wxBorder wxWindowMSW::GetDefaultBorder() const
 {

-    return GetDefaultBorderForControl();
+    // return GetDefaultBorderForControl();
+    return wxWindowBase::GetDefaultBorder();

 }
 
 }
 

+// Translate wxBORDER_THEME (and other border styles if necessary to the value
+// that makes most sense for this Windows environment
+wxBorder wxWindowMSW::TranslateBorder(wxBorder border) const
+{
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+    if (border == wxBORDER_THEME || border == wxBORDER_SUNKEN || border == wxBORDER_SIMPLE)
+        return wxBORDER_SIMPLE;
+    else
+        return wxBORDER_NONE;
+#else
+#if wxUSE_UXTHEME
+    if (border == wxBORDER_THEME)
+    {
+        if (CanApplyThemeBorder())
+        {
+            wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
+            if (theme)
+                return wxBORDER_THEME;
+        }
+    }
+#endif
+    return border;
+#endif
+
+    return border;
+}
+
+

 WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
 {
     // translate common wxWidgets styles to Windows ones
 WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
 {
     // translate common wxWidgets styles to Windows ones


@@ -1341,7 +1370,10 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
     if ( flags & wxHSCROLL )
         style |= WS_HSCROLL;
 
     if ( flags & wxHSCROLL )
         style |= WS_HSCROLL;
 

-    const wxBorder border = GetBorder(flags);
+    const wxBorder border = TranslateBorder(GetBorder(flags));
+
+    // After translation, border is now optimized for the specific version of Windows
+    // and theme engine presence.

 
     // WS_BORDER is only required for wxBORDER_SIMPLE
     if ( border == wxBORDER_SIMPLE )
 
     // WS_BORDER is only required for wxBORDER_SIMPLE
     if ( border == wxBORDER_SIMPLE )


@@ -3260,7 +3292,8 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
         case WM_NCCALCSIZE:
             {
                 wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
         case WM_NCCALCSIZE:
             {
                 wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();

-                if (theme && GetBorder() == wxBORDER_THEME)
+                const wxBorder border = TranslateBorder(GetBorder());
+                if (theme && border == wxBORDER_THEME)

                 {
                     // first ask the widget to calculate the border size
                     rc.result = MSWDefWindowProc(message, wParam, lParam);
                 {
                     // first ask the widget to calculate the border size
                     rc.result = MSWDefWindowProc(message, wParam, lParam);


@@ -3300,7 +3333,8 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
         case WM_NCPAINT:
             {
                 wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
         case WM_NCPAINT:
             {
                 wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();

-                if (theme && GetBorder() == wxBORDER_THEME)
+                const wxBorder border = TranslateBorder(GetBorder());
+                if (theme && border == wxBORDER_THEME)

                 {
                     // first ask the widget to paint its non-client area, such as scrollbars, etc.
                     rc.result = MSWDefWindowProc(message, wParam, lParam);
                 {
                     // first ask the widget to paint its non-client area, such as scrollbars, etc.
                     rc.result = MSWDefWindowProc(message, wParam, lParam);