disabled (conditionally) separating static line; improved borders

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

diff --git a/include/wx/listbook.h b/include/wx/listbook.h
index 1c4c5ae51342b18b16ca731bbe333f91efe186f7..c54b06e33f87eff2fbeafdf25d30a8f0d0dc462c 100644 (file)
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -20,11 +20,24 @@
 
 #if wxUSE_LISTBOOK
 
+// this can be defined to put a static line as separator between the list
+// control and the page area; but I think it finally looks better without it so
+// it is not enabled by default
+//#define wxUSE_LINE_IN_LISTBOOK 1
+
+#if !wxUSE_STATLINE
+    #undef wxUSE_LINE_IN_LISTBOOK
+    #define wxUSE_LINE_IN_LISTBOOK 0
+#endif
+
 #include "wx/bookctrl.h"
 
 class WXDLLEXPORT wxListView;
 class WXDLLEXPORT wxListEvent;
-class WXDLLEXPORT wxStaticLine;;
+
+#if wxUSE_LINE_IN_LISTBOOK
+class WXDLLEXPORT wxStaticLine;
+#endif // wxUSE_LINE_IN_LISTBOOK
 
 // ----------------------------------------------------------------------------
 // constants
@@ -117,8 +130,10 @@ private:
     // the list control we use for showing the pages index
     wxListView *m_list;
 
+#if wxUSE_LINE_IN_LISTBOOK
     // the line separating it from the page area
     wxStaticLine *m_line;
+#endif // wxUSE_LINE_IN_LISTBOOK
 
     // the currently selected page or wxNOT_FOUND if none
     int m_selection;

diff --git a/src/generic/listbkg.cpp b/src/generic/listbkg.cpp
index 88d84cee383bf2dbd923517d66c6fbf976d8be47..676b202c93662e19cc6c0b1ebe397b3effda71ca 100644 (file)
--- a/src/generic/listbkg.cpp
+++ b/src/generic/listbkg.cpp
@@ -72,7 +72,9 @@ END_EVENT_TABLE()
 void wxListbook::Init()
 {
     m_list = NULL;
+#if wxUSE_LINE_IN_LISTBOOK
     m_line = NULL;
+#endif // wxUSE_LINE_IN_LISTBOOK
     m_selection = wxNOT_FOUND;
 }
 
@@ -93,6 +95,11 @@ wxListbook::Create(wxWindow *parent,
 #endif // __WXMAC__/!__WXMAC__
     }
 
+    // no border for this control, it doesn't look nice together with
+    // wxListCtrl border
+    style &= ~wxBORDER_MASK;
+    style |= wxBORDER_NONE;
+
     if ( !wxControl::Create(parent, id, pos, size, style,
                             wxDefaultValidator, name) )
         return false;
@@ -103,10 +110,11 @@ wxListbook::Create(wxWindow *parent,
                     wxID_LISTBOOKLISTVIEW,
                     wxDefaultPosition,
                     wxDefaultSize,
-                    wxBORDER_NONE | wxLC_ICON | wxLC_SINGLE_SEL |
+                    wxLC_ICON | wxLC_SINGLE_SEL |
                         (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP)
                  );
 
+#if wxUSE_LINE_IN_LISTBOOK
     m_line = new wxStaticLine
                  (
                     this,
@@ -115,6 +123,7 @@ wxListbook::Create(wxWindow *parent,
                     wxDefaultSize,
                     IsVertical() ? wxLI_HORIZONTAL : wxLI_VERTICAL
                  );
+#endif // wxUSE_LINE_IN_LISTBOOK
 
     return true;
 }
@@ -212,6 +221,7 @@ void wxListbook::OnSize(wxSizeEvent& event)
     m_list->Move(posList.x, posList.y);
     m_list->SetClientSize(sizeList.x, sizeList.y);
 
+#if wxUSE_LINE_IN_LISTBOOK
     if ( m_line )
     {
         wxRect rectLine(wxPoint(0, 0), sizeClient);
@@ -241,6 +251,7 @@ void wxListbook::OnSize(wxSizeEvent& event)
 
         m_line->SetSize(rectLine);
     }
+#endif // wxUSE_LINE_IN_LISTBOOK
 
     // we should always have some selection if possible
     if ( m_selection == wxNOT_FOUND && GetPageCount() )