fix the bug with renaming groups leaving wxFileConfig in inconsistent state (closes...

[wxWidgets.git] / samples / render / render.cpp

diff --git a/samples/render/render.cpp b/samples/render/render.cpp
index d98f456b83144aa92f8afeb23d0b888635adebac..2136996b180ff7a8e45282a4c5260db7259baf1c 100644 (file)
--- a/samples/render/render.cpp
+++ b/samples/render/render.cpp
@@ -34,6 +34,7 @@
     #include "wx/textdlg.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"
     #include "wx/textdlg.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"

+    #include "wx/icon.h"

 #endif
 
 #include "wx/apptrait.h"
 #endif
 
 #include "wx/apptrait.h"


@@ -58,10 +59,12 @@ class MyRenderer : public wxDelegateRendererNative
 public:
     MyRenderer() : wxDelegateRendererNative(wxRendererNative::GetDefault()) { }
 
 public:
     MyRenderer() : wxDelegateRendererNative(wxRendererNative::GetDefault()) { }
 

-    virtual void DrawHeaderButton(wxWindow * WXUNUSED(win),
+    virtual void DrawHeaderButton(wxWindow *WXUNUSED(win),

                                   wxDC& dc,
                                   const wxRect& rect,
                                   wxDC& dc,
                                   const wxRect& rect,

-                                  int WXUNUSED(flags) = 0)
+                                  int WXUNUSED(flags) = 0,
+                                  wxHeaderSortIconType WXUNUSED(sortArrow) = wxHDR_SORT_ICON_NONE,
+                                  wxHeaderButtonParams* WXUNUSED(params) = NULL)

     {
         dc.SetBrush(*wxBLUE_BRUSH);
         dc.SetTextForeground(*wxWHITE);
     {
         dc.SetBrush(*wxBLUE_BRUSH);
         dc.SetTextForeground(*wxWHITE);


@@ -102,8 +105,10 @@ public:
     virtual ~MyFrame();
 
     // event handlers (these functions should _not_ be virtual)
     virtual ~MyFrame();
 
     // event handlers (these functions should _not_ be virtual)

+#if wxUSE_DYNLIB_CLASS

     void OnLoad(wxCommandEvent& event);
     void OnUnload(wxCommandEvent& event);
     void OnLoad(wxCommandEvent& event);
     void OnUnload(wxCommandEvent& event);

+#endif // wxUSE_DYNLIB_CLASS

     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 


@@ -146,8 +151,10 @@ END_EVENT_TABLE()
 enum
 {
     // our menu items
 enum
 {
     // our menu items

+#if wxUSE_DYNLIB_CLASS

     Render_Load = 100,
     Render_Unload,
     Render_Load = 100,
     Render_Unload,

+#endif // wxUSE_DYNLIB_CLASS

 
     // standard menu items
     Render_Quit = wxID_EXIT,
 
     // standard menu items
     Render_Quit = wxID_EXIT,


@@ -166,8 +173,10 @@ enum
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

+#if wxUSE_DYNLIB_CLASS

     EVT_MENU(Render_Load,  MyFrame::OnLoad)
     EVT_MENU(Render_Unload,MyFrame::OnUnload)
     EVT_MENU(Render_Load,  MyFrame::OnLoad)
     EVT_MENU(Render_Unload,MyFrame::OnUnload)

+#endif // wxUSE_DYNLIB_CLASS

     EVT_MENU(Render_Quit,  MyFrame::OnQuit)
 
     EVT_MENU(Render_About, MyFrame::OnAbout)
     EVT_MENU(Render_Quit,  MyFrame::OnQuit)
 
     EVT_MENU(Render_About, MyFrame::OnAbout)


@@ -204,7 +213,7 @@ bool MyApp::OnInit()
 // frame constructor
 MyFrame::MyFrame()
        : wxFrame(NULL,
 // frame constructor
 MyFrame::MyFrame()
        : wxFrame(NULL,

-                 -1,
+                 wxID_ANY,

                  _T("Render wxWidgets Sample"),
                  wxPoint(50, 50),
                  wxSize(450, 340))
                  _T("Render wxWidgets Sample"),
                  wxPoint(50, 50),
                  wxSize(450, 340))


@@ -215,8 +224,10 @@ MyFrame::MyFrame()
 #if wxUSE_MENUS
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 #if wxUSE_MENUS
     // create a menu bar
     wxMenu *menuFile = new wxMenu;

+#if wxUSE_DYNLIB_CLASS

     menuFile->Append(Render_Load, _T("&Load renderer...\tCtrl-L"));
     menuFile->Append(Render_Unload, _T("&Unload renderer\tCtrl-U"));
     menuFile->Append(Render_Load, _T("&Load renderer...\tCtrl-L"));
     menuFile->Append(Render_Unload, _T("&Unload renderer\tCtrl-U"));

+#endif // wxUSE_DYNLIB_CLASS

     menuFile->Append(Render_Quit, _T("E&xit\tCtrl-Q"), _T("Quit this program"));
 
     // the "About" item should be in the help menu
     menuFile->Append(Render_Quit, _T("E&xit\tCtrl-Q"), _T("Quit this program"));
 
     // the "About" item should be in the help menu


@@ -251,6 +262,8 @@ MyFrame::~MyFrame()
 
 // event handlers
 
 
 // event handlers
 

+#if wxUSE_DYNLIB_CLASS
+

 void MyFrame::OnLoad(wxCommandEvent& WXUNUSED(event))
 {
     static wxString s_name = _T("renddll");
 void MyFrame::OnLoad(wxCommandEvent& WXUNUSED(event))
 {
     static wxString s_name = _T("renddll");


@@ -303,6 +316,8 @@ void MyFrame::OnUnload(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+#endif // wxUSE_DYNLIB_CLASS
+

 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     // true is to force the frame to close
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     // true is to force the frame to close