wxX11 wants to have the border style flag

    in wxWindowX11.

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

diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp
index 65c41bc9dfad0b3eec2e8d964b0b964efee5a13e..725eafa5ec721fcc211e06ef094060a8589f41a0 100644 (file)
--- a/src/univ/listbox.cpp
+++ b/src/univ/listbox.cpp
@@ -101,7 +101,14 @@ bool wxListBox::Create(wxWindow *parent,
     if ( !(style & (wxLB_MULTIPLE | wxLB_EXTENDED)) )
         style |= wxLB_SINGLE;
 
     if ( !(style & (wxLB_MULTIPLE | wxLB_EXTENDED)) )
         style |= wxLB_SINGLE;
 

-    if ( !wxControl::Create(parent, id, pos, size, style | wxVSCROLL , wxDefaultValidator, name) )
+#if wxUSE_TWO_WINDOWS
+    style |=  wxVSCROLL|wxHSCROLL;
+    if ((style & wxBORDER_MASK) == 0)
+        style |= wxBORDER_SUNKEN;
+#endif
+
+    if ( !wxControl::Create(parent, id, pos, size, style, 
+                            wxDefaultValidator, name) )

         return FALSE;
 
     SetWindow(this);
         return FALSE;
 
     SetWindow(this);

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index e1cedbad1289db234de92cd2f1980d2823e106a0..13d8d1054c036bb4b576b07d922ff6663b4a69a5 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -691,6 +691,11 @@ bool wxTextCtrl::Create(wxWindow *parent,
         // create data object for single line controls
         m_data.sdata = new wxTextSingleLineData;
     }
         // create data object for single line controls
         m_data.sdata = new wxTextSingleLineData;
     }

+    
+#if wxUSE_TWO_WINDOWS
+    if ((style & wxBORDER_MASK) == 0)
+        style |= wxBORDER_SUNKEN;
+#endif

 
     if ( !wxControl::Create(parent, id, pos, size, style,
                             validator, name) )
 
     if ( !wxControl::Create(parent, id, pos, size, style,
                             validator, name) )

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index ba02e22faf2846cab43a1609ecbecfe3d477aa79..7bb3909034e9a51ea55aa0174f307bafd8091b90 100644 (file)
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -1864,8 +1864,12 @@ wxRect wxWin32Renderer::GetBorderDimensions(wxBorder border) const
             break;
 
         default:
             break;
 
         default:

+        { 
+            // char *crash = NULL;
+            // *crash = 0;

             wxFAIL_MSG(_T("unknown border type"));
             // fall through
             wxFAIL_MSG(_T("unknown border type"));
             // fall through

+        }

 
         case wxBORDER_DEFAULT:
         case wxBORDER_NONE:
 
         case wxBORDER_DEFAULT:
         case wxBORDER_NONE: