wxToolBarBase -> wxToolBar

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

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index 2c28ca05602812a4d5202bb9f9e17094e325cdce..2e82eb8c27702bdca543cd1865a9d630409bf711 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -695,7 +695,7 @@ wxResourceEditorScrolledWindow *wxResourceManager::OnCreateEditorPanel(wxFrame *
   return panel;
 }
 
   return panel;
 }
 

-wxToolBarBase *wxResourceManager::OnCreateToolBar(wxFrame *parent)
+wxToolBar *wxResourceManager::OnCreateToolBar(wxFrame *parent)

 {
   // Load palette bitmaps
 #ifdef __WXMSW__
 {
   // Load palette bitmaps
 #ifdef __WXMSW__

diff --git a/utils/dialoged/src/reseditr.h b/utils/dialoged/src/reseditr.h
index e2dafcc71ce0e69ac842b93e8a4d32c9c0ba96d0..4af3085bb79a9c5f9c7dc0264876859bd48742f6 100644 (file)
--- a/utils/dialoged/src/reseditr.h
+++ b/utils/dialoged/src/reseditr.h
@@ -191,7 +191,7 @@ public:
    virtual wxFrame *OnCreateEditorFrame(const char *title);
    virtual wxMenuBar *OnCreateEditorMenuBar(wxFrame *parent);
    virtual wxResourceEditorScrolledWindow *OnCreateEditorPanel(wxFrame *parent);
    virtual wxFrame *OnCreateEditorFrame(const char *title);
    virtual wxMenuBar *OnCreateEditorMenuBar(wxFrame *parent);
    virtual wxResourceEditorScrolledWindow *OnCreateEditorPanel(wxFrame *parent);

-   virtual wxToolBarBase *OnCreateToolBar(wxFrame *parent);
+   virtual wxToolBar *OnCreateToolBar(wxFrame *parent);

 
    // Create a window information object for the give window
    wxWindowPropertyInfo* CreatePropertyInfoForWindow(wxWindow *win);
 
    // Create a window information object for the give window
    wxWindowPropertyInfo* CreatePropertyInfoForWindow(wxWindow *win);