Fixed XIM compilation, but doesn't work yet.

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

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 8db65d0ad9fc6e52c9f96cb51439bc046e368c55..a66bb77444afeea33784f2f8da393572ad181558 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -84,12 +84,7 @@ enum
 {
     // menu items
     Minimal_Quit = 1,
 {
     // menu items
     Minimal_Quit = 1,

-    Minimal_About,
-    Minimal_Test1,
-    Minimal_Test2,
-
-    // controls start here (the numbers are, of course, arbitrary)
-    Minimal_Text = 1000,
+    Minimal_About

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -149,22 +144,24 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     SetIcon(wxICON(mondrian));
 
     // create a menu bar
     SetIcon(wxICON(mondrian));
 
     // create a menu bar

-    wxMenu *menuFile = new wxMenu;
+    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);

 
     menuFile->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");
     menuFile->AppendSeparator();
     menuFile->Append(Minimal_Quit, "E&xit\tAlt-X", "Quit this program");
 
     // now append the freshly created menu to the menu bar...
 
     menuFile->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");
     menuFile->AppendSeparator();
     menuFile->Append(Minimal_Quit, "E&xit\tAlt-X", "Quit this program");
 
     // now append the freshly created menu to the menu bar...

-    wxMenuBar *menuBar = new wxMenuBar;
+    wxMenuBar *menuBar = new wxMenuBar();

     menuBar->Append(menuFile, "&File");
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     menuBar->Append(menuFile, "&File");
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 

+#if wxUSE_STATUSBAR

     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
     SetStatusText("Welcome to wxWindows!");
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
     SetStatusText("Welcome to wxWindows!");

+#endif // wxUSE_STATUSBAR

 }
 
 
 }