don't crash when destroying a not initialized socket (patch 1489095)

[wxWidgets.git] / src / generic / toolbkg.cpp

diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp
index 611db38af56e8b2b729523e63579cf0d976a8e19..e0cbd98b819264642a3952c63fc6a3bef1b15193 100644 (file)
--- a/src/generic/toolbkg.cpp
+++ b/src/generic/toolbkg.cpp
@@ -9,14 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -24,12 +16,21 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_LISTBOOK
+#if wxUSE_TOOLBOOK

 
 

-#include "wx/toolbar.h"
-#include "wx/toolbook.h"
-#include "wx/settings.h"
+#ifndef WX_PRECOMP
+    #include "wx/icon.h"
+    #include "wx/settings.h"
+    #include "wx/toolbar.h"
+#endif
+
+#include "wx/imaglist.h"

 #include "wx/sysopt.h"
 #include "wx/sysopt.h"

+#include "wx/toolbook.h"
+
+#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
+#include "wx/generic/buttonbar.h"
+#endif

 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros
 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros


@@ -45,8 +46,10 @@
 IMPLEMENT_DYNAMIC_CLASS(wxToolbook, wxBookCtrlBase)
 IMPLEMENT_DYNAMIC_CLASS(wxToolbookEvent, wxNotifyEvent)
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolbook, wxBookCtrlBase)
 IMPLEMENT_DYNAMIC_CLASS(wxToolbookEvent, wxNotifyEvent)
 

+#if !WXWIN_COMPATIBILITY_EVENT_TYPES

 const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = wxNewEventType();
 const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = wxNewEventType();
 const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = wxNewEventType();
 const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = wxNewEventType();

+#endif

 const int wxID_TOOLBOOKTOOLBAR = wxNewId();
 
 BEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase)
 const int wxID_TOOLBOOKTOOLBAR = wxNewId();
 
 BEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase)


@@ -69,8 +72,7 @@ void wxToolbook::Init()
     m_needsRealizing = false;
 }
 
     m_needsRealizing = false;
 }
 

-bool
-wxToolbook::Create(wxWindow *parent,
+bool wxToolbook::Create(wxWindow *parent,

                    wxWindowID id,
                    const wxPoint& pos,
                    const wxSize& size,
                    wxWindowID id,
                    const wxPoint& pos,
                    const wxSize& size,


@@ -78,9 +80,7 @@ wxToolbook::Create(wxWindow *parent,
                    const wxString& name)
 {
     if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
                    const wxString& name)
 {
     if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )

-    {

         style |= wxBK_TOP;
         style |= wxBK_TOP;

-    }

 
     // no border for this control
     style &= ~wxBORDER_MASK;
 
     // no border for this control
     style &= ~wxBORDER_MASK;


@@ -90,15 +90,36 @@ wxToolbook::Create(wxWindow *parent,
                             wxDefaultValidator, name) )
         return false;
 
                             wxDefaultValidator, name) )
         return false;
 

-    // TODO: make configurable
-    m_bookctrl = new wxToolBar
+    int orient = wxTB_HORIZONTAL;
+    if ( (style & (wxBK_LEFT | wxBK_RIGHT)) != 0)
+        orient = wxTB_VERTICAL;
+
+    // TODO: make more configurable
+    
+#if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
+    if (style & wxBK_BUTTONBAR)
+    {
+        m_bookctrl = new wxButtonToolBar
+                 (
+                    this,
+                    wxID_TOOLBOOKTOOLBAR,
+                    wxDefaultPosition,
+                    wxDefaultSize,
+                    orient|wxTB_TEXT|wxTB_FLAT|wxNO_BORDER
+                 );
+    }
+    else
+#endif
+    {
+        m_bookctrl = new wxToolBar

                  (
                     this,
                     wxID_TOOLBOOKTOOLBAR,
                     wxDefaultPosition,
                     wxDefaultSize,
                  (
                     this,
                     wxID_TOOLBOOKTOOLBAR,
                     wxDefaultPosition,
                     wxDefaultSize,

-                    wxTB_HORIZONTAL|wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER
+                    orient|wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER|wxNO_BORDER

                  );
                  );

+    }

 
     return true;
 }
 
     return true;
 }


@@ -133,7 +154,7 @@ void wxToolbook::OnSize(wxSizeEvent& event)
 {
     if (m_needsRealizing)
         Realize();
 {
     if (m_needsRealizing)
         Realize();

-    
+

     wxBookCtrlBase::OnSize(event);
 }
 
     wxBookCtrlBase::OnSize(event);
 }
 


@@ -155,7 +176,6 @@ wxSize wxToolbook::CalcSizeFromPage(const wxSize& sizePage) const
     return size;
 }
 
     return size;
 }
 

-

 // ----------------------------------------------------------------------------
 // accessing the pages
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // accessing the pages
 // ----------------------------------------------------------------------------


@@ -163,7 +183,7 @@ wxSize wxToolbook::CalcSizeFromPage(const wxSize& sizePage) const
 bool wxToolbook::SetPageText(size_t n, const wxString& strText)
 {
     // Assume tool ids start from 1
 bool wxToolbook::SetPageText(size_t n, const wxString& strText)
 {
     // Assume tool ids start from 1

-    wxToolBarToolBase* tool = GetToolBar()->FindById(n+1);
+    wxToolBarToolBase* tool = GetToolBar()->FindById(n + 1);

     if (tool)
     {
         tool->SetLabel(strText);
     if (tool)
     {
         tool->SetLabel(strText);


@@ -175,11 +195,9 @@ bool wxToolbook::SetPageText(size_t n, const wxString& strText)
 
 wxString wxToolbook::GetPageText(size_t n) const
 {
 
 wxString wxToolbook::GetPageText(size_t n) const
 {

-    wxToolBarToolBase* tool = GetToolBar()->FindById(n+1);
+    wxToolBarToolBase* tool = GetToolBar()->FindById(n + 1);

     if (tool)
     if (tool)

-    {

         return tool->GetLabel();
         return tool->GetLabel();

-    }

     else
         return wxEmptyString;
 }
     else
         return wxEmptyString;
 }


@@ -196,8 +214,8 @@ bool wxToolbook::SetPageImage(size_t n, int imageId)
     wxASSERT( GetImageList() != NULL );
     if (!GetImageList())
         return false;
     wxASSERT( GetImageList() != NULL );
     if (!GetImageList())
         return false;

-    
-    wxToolBarToolBase* tool = GetToolBar()->FindById(n+1);
+
+    wxToolBarToolBase* tool = GetToolBar()->FindById(n + 1);

     if (tool)
     {
         // Find the image list index for this tool
     if (tool)
     {
         // Find the image list index for this tool


@@ -251,7 +269,7 @@ int wxToolbook::SetSelection(size_t n)
 
             // change m_selection now to ignore the selection change event
             m_selection = n;
 
             // change m_selection now to ignore the selection change event
             m_selection = n;

-            GetToolBar()->ToggleTool(n+1, true);
+            GetToolBar()->ToggleTool(n + 1, true);

 
             // program allows the page change
             event.SetEventType(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED);
 
             // program allows the page change
             event.SetEventType(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED);


@@ -269,14 +287,15 @@ void wxToolbook::Realize()
     if (m_needsRealizing)
     {
         GetToolBar()->SetToolBitmapSize(m_maxBitmapSize);
     if (m_needsRealizing)
     {
         GetToolBar()->SetToolBitmapSize(m_maxBitmapSize);

-        
+
+        int remap = wxSystemOptions::GetOptionInt(wxT("msw.remap"));

         wxSystemOptions::SetOption(wxT("msw.remap"), 0);
         GetToolBar()->Realize();
         wxSystemOptions::SetOption(wxT("msw.remap"), 0);
         GetToolBar()->Realize();

-        wxSystemOptions::SetOption(wxT("msw.remap"), 1);
+        wxSystemOptions::SetOption(wxT("msw.remap"), remap);

     }
     }

-    
+

     m_needsRealizing = false;
     m_needsRealizing = false;

-    
+

     if (m_selection == -1)
         m_selection = 0;
 
     if (m_selection == -1)
         m_selection = 0;
 


@@ -286,7 +305,7 @@ void wxToolbook::Realize()
         m_selection = -1;
         SetSelection(sel);
     }
         m_selection = -1;
         SetSelection(sel);
     }

-    
+

     DoSize();
 }
 
     DoSize();
 }
 


@@ -301,8 +320,7 @@ void wxToolbook::OnIdle(wxIdleEvent& event)
 // adding/removing the pages
 // ----------------------------------------------------------------------------
 
 // adding/removing the pages
 // ----------------------------------------------------------------------------
 

-bool
-wxToolbook::InsertPage(size_t n,
+bool wxToolbook::InsertPage(size_t n,

                        wxWindow *page,
                        const wxString& text,
                        bool bSelect,
                        wxWindow *page,
                        const wxString& text,
                        bool bSelect,


@@ -312,26 +330,32 @@ wxToolbook::InsertPage(size_t n,
         return false;
 
     m_needsRealizing = true;
         return false;
 
     m_needsRealizing = true;

-    
+

     wxASSERT(GetImageList() != NULL);
     wxASSERT(GetImageList() != NULL);

-    
+

     if (!GetImageList())
         return false;
 
     if (!GetImageList())
         return false;
 

+    // TODO: make sure all platforms can convert between icon and bitmap,
+    // and/or test whether the image is a bitmap or an icon.
+#ifdef __WXMAC__
+    wxBitmap bitmap = GetImageList()->GetBitmap(imageId);
+#else

     // On Windows, we can lose information by using GetBitmap, so extract icon instead
     wxIcon icon = GetImageList()->GetIcon(imageId);
     wxBitmap bitmap;
     bitmap.CopyFromIcon(icon);
     // On Windows, we can lose information by using GetBitmap, so extract icon instead
     wxIcon icon = GetImageList()->GetIcon(imageId);
     wxBitmap bitmap;
     bitmap.CopyFromIcon(icon);

-    
+#endif
+

     m_maxBitmapSize.x = wxMax(bitmap.GetWidth(), m_maxBitmapSize.x);
     m_maxBitmapSize.y = wxMax(bitmap.GetHeight(), m_maxBitmapSize.y);
     m_maxBitmapSize.x = wxMax(bitmap.GetWidth(), m_maxBitmapSize.x);
     m_maxBitmapSize.y = wxMax(bitmap.GetHeight(), m_maxBitmapSize.y);

-    
+

     GetToolBar()->SetToolBitmapSize(m_maxBitmapSize);
     GetToolBar()->SetToolBitmapSize(m_maxBitmapSize);

-    GetToolBar()->AddRadioTool(n+1, text, bitmap, wxNullBitmap, text);
+    GetToolBar()->AddRadioTool(n + 1, text, bitmap, wxNullBitmap, text);

 
     if (bSelect)
     {
 
     if (bSelect)
     {

-        // GetToolBar()->ToggleTool(n, true);
+        GetToolBar()->ToggleTool(n, true);

         m_selection = n;
     }
     else
         m_selection = n;
     }
     else


@@ -348,7 +372,7 @@ wxWindow *wxToolbook::DoRemovePage(size_t page)
 
     if ( win )
     {
 
     if ( win )
     {

-        GetToolBar()->DeleteTool(page+1);
+        GetToolBar()->DeleteTool(page + 1);

 
         if (m_selection >= (int)page)
         {
 
         if (m_selection >= (int)page)
         {


@@ -383,7 +407,7 @@ bool wxToolbook::DeleteAllPages()
 
 void wxToolbook::OnToolSelected(wxCommandEvent& event)
 {
 
 void wxToolbook::OnToolSelected(wxCommandEvent& event)
 {

-    const int selNew = event.GetId() -1;
+    const int selNew = event.GetId() - 1;

 
     if ( selNew == m_selection )
     {
 
     if ( selNew == m_selection )
     {