fix sizing of extra control

[wxWidgets.git] / samples / xrc / myframe.cpp

diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp
index 2d03b22e442f4f35b6cf7ae74ec1ed18259e253e..3a6453d3e8461956b370c4164aa6a210401f9ff3 100644 (file)
--- a/samples/xrc/myframe.cpp
+++ b/samples/xrc/myframe.cpp
@@ -8,15 +8,7 @@
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// GCC implementation
-//-----------------------------------------------------------------------------
-
-#ifdef __GNUG__
-    #pragma implementation "myframe.h"
-#endif
-
-//-----------------------------------------------------------------------------
-// Standard wxWindows headers
+// Standard wxWidgets headers

 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".
 //-----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -27,11 +19,13 @@
 #endif
 
 // For all others, include the necessary headers (this file is usually all you
 #endif
 
 // For all others, include the necessary headers (this file is usually all you

-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)

 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
 

+#include "wx/sysopt.h"
+

 //-----------------------------------------------------------------------------
 // Header of this .cpp file
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Header of this .cpp file
 //-----------------------------------------------------------------------------


@@ -73,25 +67,27 @@
 // Event table: connect the events to the handler functions to process them
 //-----------------------------------------------------------------------------
 
 // Event table: connect the events to the handler functions to process them
 //-----------------------------------------------------------------------------
 

-// The event tables connect the wxWindows events with the functions (event
+// The event tables connect the wxWidgets events with the functions (event

 // 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.
 // 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.

-// The reason why the menuitems and tools are given the same name in the 
+// The reason why the menuitems and tools are given the same name in the

 // XRC file, is that both a tool (a toolbar item) and a menuitem are designed
 // XRC file, is that both a tool (a toolbar item) and a menuitem are designed

-// to fire the same kind of event (an EVT_MENU) and thus I give them the same 
-// ID name to help new users emphasize this point which is often overlooked 
-// when starting out with wxWindows.
+// to fire the same kind of event (an EVT_MENU) and thus I give them the same
+// ID name to help new users emphasize this point which is often overlooked
+// when starting out with wxWidgets.

 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

-    EVT_MENU(XRCID("exit_tool_or_menuitem"),  MyFrame::OnExitToolOrMenuCommand)
-    EVT_MENU(XRCID("non_derived_dialog_tool_or_menuitem"), MyFrame::OnNonDerivedDialogToolOrMenuCommand) 
-    EVT_MENU(XRCID("derived_tool_or_menuitem"), MyFrame::OnDerivedDialogToolOrMenuCommand) 
-    EVT_MENU(XRCID("controls_tool_or_menuitem"), MyFrame::OnControlsToolOrMenuCommand) 
-    EVT_MENU(XRCID("uncentered_tool_or_menuitem"), MyFrame::OnUncenteredToolOrMenuCommand) 
-    EVT_MENU(XRCID("custom_class_tool_or_menuitem"), MyFrame::OnCustomClassToolOrMenuCommand) 
+    EVT_MENU(XRCID("unload_resource_menuitem"), MyFrame::OnUnloadResourceMenuCommand)
+    EVT_MENU(XRCID("reload_resource_menuitem"), MyFrame::OnReloadResourceMenuCommand)
+    EVT_MENU(wxID_EXIT,  MyFrame::OnExitToolOrMenuCommand)
+    EVT_MENU(XRCID("non_derived_dialog_tool_or_menuitem"), MyFrame::OnNonDerivedDialogToolOrMenuCommand)
+    EVT_MENU(XRCID("derived_tool_or_menuitem"), MyFrame::OnDerivedDialogToolOrMenuCommand)
+    EVT_MENU(XRCID("controls_tool_or_menuitem"), MyFrame::OnControlsToolOrMenuCommand)
+    EVT_MENU(XRCID("uncentered_tool_or_menuitem"), MyFrame::OnUncenteredToolOrMenuCommand)
+    EVT_MENU(XRCID("custom_class_tool_or_menuitem"), MyFrame::OnCustomClassToolOrMenuCommand)

     EVT_MENU(XRCID("platform_property_tool_or_menuitem"), MyFrame::OnPlatformPropertyToolOrMenuCommand)
     EVT_MENU(XRCID("art_provider_tool_or_menuitem"), MyFrame::OnArtProviderToolOrMenuCommand)
     EVT_MENU(XRCID("variable_expansion_tool_or_menuitem"), MyFrame::OnVariableExpansionToolOrMenuCommand)
     EVT_MENU(XRCID("platform_property_tool_or_menuitem"), MyFrame::OnPlatformPropertyToolOrMenuCommand)
     EVT_MENU(XRCID("art_provider_tool_or_menuitem"), MyFrame::OnArtProviderToolOrMenuCommand)
     EVT_MENU(XRCID("variable_expansion_tool_or_menuitem"), MyFrame::OnVariableExpansionToolOrMenuCommand)

-    EVT_MENU(XRCID("about_tool_or_menuitem"), MyFrame::OnAboutToolOrMenuCommand)
+    EVT_MENU(wxID_ABOUT, MyFrame::OnAboutToolOrMenuCommand)

 END_EVENT_TABLE()
 
 //-----------------------------------------------------------------------------
 END_EVENT_TABLE()
 
 //-----------------------------------------------------------------------------


@@ -102,42 +98,62 @@ END_EVENT_TABLE()
 MyFrame::MyFrame(wxWindow* parent)
 {
     // Load up this frame from XRC. [Note, instead of making a class's
 MyFrame::MyFrame(wxWindow* parent)
 {
     // Load up this frame from XRC. [Note, instead of making a class's

-    // constructor take a wxWindow* parent with a default value of NULL, 
-    // we could have just had designed MyFrame class with an empty 
+    // constructor take a wxWindow* parent with a default value of NULL,
+    // we could have just had designed MyFrame class with an empty

     // constructor and then written here:
     // wxXmlResource::Get()->LoadFrame(this, (wxWindow* )NULL, "main_frame");
     // constructor and then written here:
     // wxXmlResource::Get()->LoadFrame(this, (wxWindow* )NULL, "main_frame");

-    // since this frame will always be the top window, and thus parentless. 
-    // However, the current approach has source code that can be recycled 
+    // since this frame will always be the top window, and thus parentless.
+    // However, the current approach has source code that can be recycled

     // for other frames that aren't the top level window.]
     // for other frames that aren't the top level window.]

-    wxXmlResource::Get()->LoadFrame(this, parent, "main_frame");
+    wxXmlResource::Get()->LoadFrame(this, parent, wxT("main_frame"));

 
     // Set the icon for the frame.
     SetIcon(wxICON(appicon));
 
     // Load the menubar from XRC and set this frame's menubar to it.
 
     // Set the icon for the frame.
     SetIcon(wxICON(appicon));
 
     // Load the menubar from XRC and set this frame's menubar to it.

-    SetMenuBar(wxXmlResource::Get()->LoadMenuBar("main_menu"));
+    SetMenuBar(wxXmlResource::Get()->LoadMenuBar(wxT("main_menu")));

     // Load the toolbar from XRC and set this frame's toolbar to it.
     // NOTE: For toolbars you currently should do it exactly like this.
     // With toolbars, you currently can't create one, and set it later. It
     // needs to be all in one step.
     // Load the toolbar from XRC and set this frame's toolbar to it.
     // NOTE: For toolbars you currently should do it exactly like this.
     // With toolbars, you currently can't create one, and set it later. It
     // needs to be all in one step.

-    SetToolBar(wxXmlResource::Get()->LoadToolBar(this, "main_toolbar"));
-    
-    // Give the frame a optional statusbar. The '1' just means one field. 
-    // A gripsizer will automatically get put on into the corner, if that 
+    wxSystemOptions::SetOption ( wxT("msw.remap"), 0 );
+    SetToolBar(wxXmlResource::Get()->LoadToolBar(this, wxT("main_toolbar")));
+
+#if wxUSE_STATUSBAR
+    // Give the frame an optional statusbar. The '1' just means one field.
+    // A gripsizer will automatically get put on into the corner, if that

     // is the normal OS behaviour for frames on that platform. Helptext
     // for menu items and toolbar tools will automatically get displayed
     // here.
     CreateStatusBar( 1 );
     // is the normal OS behaviour for frames on that platform. Helptext
     // for menu items and toolbar tools will automatically get displayed
     // here.
     CreateStatusBar( 1 );

+#endif // wxUSE_STATUSBAR

 }
 
 //-----------------------------------------------------------------------------
 // Private methods
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // Private methods
 //-----------------------------------------------------------------------------
 

+void MyFrame::OnUnloadResourceMenuCommand(wxCommandEvent& WXUNUSED(event))
+{
+    if ( wxXmlResource::Get()->Unload(wxT("rc/basicdlg.xrc")) )
+        wxLogMessage(_T("Basic dialog resource has now been unloaded, you ")
+                     _T("won't be able to use it before loading it again"));
+    else
+        wxLogWarning(_T("Failed to unload basic dialog resource"));
+}
+
+void MyFrame::OnReloadResourceMenuCommand(wxCommandEvent& WXUNUSED(event))
+{
+    if ( wxXmlResource::Get()->Load(wxT("rc/basicdlg.xrc")) )
+        wxLogStatus(_T("Basic dialog resource has been loaded."));
+    else
+        wxLogError(_T("Failed to load basic dialog resource"));
+}
+

 void MyFrame::OnExitToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
 {
 void MyFrame::OnExitToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
 {

-    // TRUE is to force the frame to close.
-    Close(TRUE);
+    // true is to force the frame to close.
+    Close(true);

 }
 
 
 }
 
 


@@ -146,36 +162,58 @@ void MyFrame::OnNonDerivedDialogToolOrMenuCommand(wxCommandEvent& WXUNUSED(event
     wxDialog dlg;
     // "non_derived_dialog" is the name of the wxDialog XRC node that should
     // be loaded.
     wxDialog dlg;
     // "non_derived_dialog" is the name of the wxDialog XRC node that should
     // be loaded.

-    wxXmlResource::Get()->LoadDialog(&dlg, this, "non_derived_dialog");
-    dlg.ShowModal();
-
+    if ( wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("non_derived_dialog")) )
+        dlg.ShowModal();

 }
 
 
 }
 
 

-void MyFrame::OnDerivedDialogToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) 
+void MyFrame::OnDerivedDialogToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))

 {
     // Make an instance of our derived dialog, passing it "this" window
 {
     // Make an instance of our derived dialog, passing it "this" window

-    // (the main frame) as the parent of the dialog. This allows the dialog 
+    // (the main frame) as the parent of the dialog. This allows the dialog

     // to be destructed automatically when the parent is destroyed.
     PreferencesDialog preferencesDialog(this);
     // Show the instance of the dialog, modally.
     preferencesDialog.ShowModal();
 }
 
     // to be destructed automatically when the parent is destroyed.
     PreferencesDialog preferencesDialog(this);
     // Show the instance of the dialog, modally.
     preferencesDialog.ShowModal();
 }
 

+void MyFrame::OnAnimationCtrlPlay(wxCommandEvent& event)
+{
+#if wxUSE_ANIMATIONCTRL
+    // get the pointers we need
+    wxButton *btn = wxDynamicCast(event.GetEventObject(), wxButton);
+    if (!btn || !btn->GetParent()) return;
+
+    wxWindow *win = btn->GetParent();
+    wxAnimationCtrl *ctrl = XRCCTRL(*win, "controls_animation_ctrl", wxAnimationCtrl);
+    if (ctrl->IsPlaying())
+    {
+        ctrl->Stop();
+        btn->SetLabel(wxT("Play"));
+    }
+    else
+    {
+        if (ctrl->Play())
+            btn->SetLabel(wxT("Stop"));
+        else
+            wxLogError(wxT("Cannot play the animation..."));
+    }
+#endif
+}

 
 

-void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) 
+void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))

 {
     wxDialog dlg;
 {
     wxDialog dlg;

-    wxXmlResource::Get()->LoadDialog(&dlg, this, "controls_dialog");
+    wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("controls_dialog"));

 
 #if wxUSE_LISTCTRL
     // There is no data in the listctrl. This will add some columns
 
 #if wxUSE_LISTCTRL
     // There is no data in the listctrl. This will add some columns

-    // and some data. You don't need use any pointers 
+    // and some data. You don't need to use any pointers

     // at all to manipulate the controls, just simply use the XRCCTL(...) macros.
     // "controls_treectrl" is the name of this control in the XRC.
     // (1) Insert a column, with the column header of "Name"
     // (The '_' function around "Name" marks this string as one to translate).
     // at all to manipulate the controls, just simply use the XRCCTL(...) macros.
     // "controls_treectrl" is the name of this control in the XRC.
     // (1) Insert a column, with the column header of "Name"
     // (The '_' function around "Name" marks this string as one to translate).

-    XRCCTRL(dlg, "controls_listctrl", wxListCtrl)->InsertColumn( 0, 
+    XRCCTRL(dlg, "controls_listctrl", wxListCtrl)->InsertColumn( 0,

                                                                  _("Name"),
                                                                  wxLIST_FORMAT_LEFT,
                                                                  ( 200 )
                                                                  _("Name"),
                                                                  wxLIST_FORMAT_LEFT,
                                                                  ( 200 )


@@ -186,12 +224,12 @@ void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
     XRCCTRL(dlg, "controls_listctrl", wxListCtrl)->InsertItem(2,wxT("Leon Li"));
 #endif
 
     XRCCTRL(dlg, "controls_listctrl", wxListCtrl)->InsertItem(2,wxT("Leon Li"));
 #endif
 

-#if wxUSE_TREECTRL    
+#if wxUSE_TREECTRL

     // There is no data in the tree ctrl. These lines will add some.
     // There is no data in the tree ctrl. These lines will add some.

-    // (1) Instead of having to write out 
-    // XRCCTRL(dlg, "controls_treectrl", wxTreeCtrl)->SomeFunction() 
+    // (1) Instead of having to write out
+    // XRCCTRL(dlg, "controls_treectrl", wxTreeCtrl)->SomeFunction()

     // each time (which is also OK), this example code will shown how
     // each time (which is also OK), this example code will shown how

-    // to make a pointer to the XRC control, so we can use 
+    // to make a pointer to the XRC control, so we can use

     // treectrl->SomeFunction() as a short cut. This is useful if you
     // will be referring to this control often in the code.
     wxTreeCtrl* treectrl = XRCCTRL(dlg, "controls_treectrl", wxTreeCtrl);
     // treectrl->SomeFunction() as a short cut. This is useful if you
     // will be referring to this control often in the code.
     wxTreeCtrl* treectrl = XRCCTRL(dlg, "controls_treectrl", wxTreeCtrl);


@@ -200,18 +238,25 @@ void MyFrame::OnControlsToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
     // (3)Append some items to the root node.
     treectrl->AppendItem(treectrl->GetRootItem(), _("Evil henchman 1"));
     treectrl->AppendItem(treectrl->GetRootItem(), _("Evil henchman 2"));
     // (3)Append some items to the root node.
     treectrl->AppendItem(treectrl->GetRootItem(), _("Evil henchman 1"));
     treectrl->AppendItem(treectrl->GetRootItem(), _("Evil henchman 2"));

-    treectrl->AppendItem(treectrl->GetRootItem(), _("Evil accountant"));      
+    treectrl->AppendItem(treectrl->GetRootItem(), _("Evil accountant"));

 #endif
 #endif

-    
+
+#if wxUSE_ANIMATIONCTRL
+    // dynamically connect our event handler for the "clicked" event of the "play" button
+    // in the animation ctrl page of our dialog
+    dlg.Connect(XRCID("controls_animation_button_play"), wxEVT_COMMAND_BUTTON_CLICKED,
+                wxCommandEventHandler(MyFrame::OnAnimationCtrlPlay));
+#endif
+

     // All done. Show the dialog.
     dlg.ShowModal();
 }
 
 
     // All done. Show the dialog.
     dlg.ShowModal();
 }
 
 

-void MyFrame::OnUncenteredToolOrMenuCommand(wxCommandEvent& WXUNUSED(event)) 
+void MyFrame::OnUncenteredToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))

 {
     wxDialog dlg;
 {
     wxDialog dlg;

-    wxXmlResource::Get()->LoadDialog(&dlg, this, "uncentered_dialog");
+    wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("uncentered_dialog"));

     dlg.ShowModal();
 }
 
     dlg.ShowModal();
 }
 


@@ -219,19 +264,19 @@ void MyFrame::OnUncenteredToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnCustomClassToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
 {
     wxDialog dlg;
 void MyFrame::OnCustomClassToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
 {
     wxDialog dlg;

-    wxXmlResource::Get()->LoadDialog(&dlg, this, "custom_class_dialog");
-    
-    // Make an instance of our new custom class. 
-    MyResizableListCtrl* a_myResizableListCtrl = new MyResizableListCtrl(&dlg, 
-                                                -1,
+    wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("custom_class_dialog"));
+
+    // Make an instance of our new custom class.
+    MyResizableListCtrl* a_myResizableListCtrl = new MyResizableListCtrl(&dlg,
+                                                wxID_ANY,

                                                 wxDefaultPosition,
                                                 wxDefaultSize,
                                                 wxLC_REPORT,
                                                 wxDefaultValidator);
                                                 wxDefaultPosition,
                                                 wxDefaultSize,
                                                 wxLC_REPORT,
                                                 wxDefaultValidator);

-    
-    // "custom_control_placeholder" is the name of the "unknown" tag in the 
+
+    // "custom_control_placeholder" is the name of the "unknown" tag in the

     // custctrl.xrc XRC file.
     // custctrl.xrc XRC file.

-    wxXmlResource::Get()->AttachUnknownControl("custom_control_placeholder",
+    wxXmlResource::Get()->AttachUnknownControl(wxT("custom_control_placeholder"),

                                                 a_myResizableListCtrl);
     dlg.ShowModal();
 }
                                                 a_myResizableListCtrl);
     dlg.ShowModal();
 }


@@ -240,7 +285,7 @@ void MyFrame::OnCustomClassToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnPlatformPropertyToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
 {
     wxDialog dlg;
 void MyFrame::OnPlatformPropertyToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
 {
     wxDialog dlg;

-    wxXmlResource::Get()->LoadDialog(&dlg, this, "platform_property_dialog");
+    wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("platform_property_dialog"));

     dlg.ShowModal();
 }
 
     dlg.ShowModal();
 }
 


@@ -248,7 +293,7 @@ void MyFrame::OnPlatformPropertyToolOrMenuCommand(wxCommandEvent& WXUNUSED(event
 void MyFrame::OnArtProviderToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
 {
     wxDialog dlg;
 void MyFrame::OnArtProviderToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
 {
     wxDialog dlg;

-    wxXmlResource::Get()->LoadDialog(&dlg, this, "art_provider_dialog");
+    wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("art_provider_dialog"));

     dlg.ShowModal();
 }
 
     dlg.ShowModal();
 }
 


@@ -256,7 +301,7 @@ void MyFrame::OnArtProviderToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnVariableExpansionToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
 {
     wxDialog dlg;
 void MyFrame::OnVariableExpansionToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
 {
     wxDialog dlg;

-    wxXmlResource::Get()->LoadDialog(&dlg, this, "variable_expansion_dialog");
+    wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("variable_expansion_dialog"));

     dlg.ShowModal();
 }
 
     dlg.ShowModal();
 }
 


@@ -267,5 +312,5 @@ void MyFrame::OnAboutToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
     msg.Printf( _T("This is the about dialog of XML resources demo.\n")
                 _T("Welcome to %s"), wxVERSION_STRING);
 
     msg.Printf( _T("This is the about dialog of XML resources demo.\n")
                 _T("Welcome to %s"), wxVERSION_STRING);
 

-    wxMessageBox(msg, "About XML resources demo", wxOK | wxICON_INFORMATION, this);
+    wxMessageBox(msg, _("About XML resources demo"), wxOK | wxICON_INFORMATION, this);

 }
 }