Don't use toolbook for formatting dialog until we have icons

Select first page

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

diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp
index 3fed169c733d4aa45754f85bd19b08c313a573bd..aeebc51ba1cbcbbc24edeb7f3c8973041bc54f7f 100644 (file)
--- a/src/richtext/richtextformatdlg.cpp
+++ b/src/richtext/richtextformatdlg.cpp
@@ -52,7 +52,7 @@
 #include "richtextbulletspage.cpp"
 #include "richtextstylepage.cpp"
 
 #include "richtextbulletspage.cpp"
 #include "richtextstylepage.cpp"
 

-#ifdef __WXMAC__
+#if 0 // def __WXMAC__

 #define wxRICHTEXT_USE_TOOLBOOK true
 #else
 #define wxRICHTEXT_USE_TOOLBOOK false
 #define wxRICHTEXT_USE_TOOLBOOK true
 #else
 #define wxRICHTEXT_USE_TOOLBOOK false


@@ -211,6 +211,7 @@ bool wxRichTextFormattingDialogFactory::CreatePages(long pages, wxRichTextFormat
 
     int availablePageCount = GetPageIdCount();
     int i;
 
     int availablePageCount = GetPageIdCount();
     int i;

+    bool selected = false;

     for (i = 0; i < availablePageCount; i ++)
     {
         int pageId = GetPageId(i);
     for (i = 0; i < availablePageCount; i ++)
     {
         int pageId = GetPageId(i);


@@ -222,10 +223,12 @@ bool wxRichTextFormattingDialogFactory::CreatePages(long pages, wxRichTextFormat
             if (panel)
             {
                 int imageIndex = GetPageImage(pageId);
             if (panel)
             {
                 int imageIndex = GetPageImage(pageId);

-                dialog->GetBookCtrl()->AddPage(panel, title, false, imageIndex);
+                dialog->GetBookCtrl()->AddPage(panel, title, !selected, imageIndex);
+                selected = true;

             }
         }
     }
             }
         }
     }

+    

     return true;
 }
 
     return true;
 }