changed to behave in same way as native win32 control and generic wxListCtrl when...

[wxWidgets.git] / demos / dbbrowse / dbbrowse.cpp

diff --git a/demos/dbbrowse/dbbrowse.cpp b/demos/dbbrowse/dbbrowse.cpp
index a2021652d872fee313b01988b0d45126bba085a1..28eafd9a980752bfe2368e0bc2b1b4712166b513 100644 (file)
--- a/demos/dbbrowse/dbbrowse.cpp
+++ b/demos/dbbrowse/dbbrowse.cpp
@@ -216,14 +216,16 @@ bool MainApp::OnInit(void)  // Does everything needed for a program start
     menu_bar->Append(file_menu, _("&File"));
     menu_bar->Append(help_menu, _("&Help"));
     frame->SetMenuBar(menu_bar);
     menu_bar->Append(file_menu, _("&File"));
     menu_bar->Append(help_menu, _("&Help"));
     frame->SetMenuBar(menu_bar);

+#if wxUSE_STATUSBAR

     frame->CreateStatusBar(1);
     Temp0.Printf(_("%s has started !"),p_ProgramCfg->GetAppName().c_str());
     frame->SetStatusText(Temp0, 0);
     frame->CreateStatusBar(1);
     Temp0.Printf(_("%s has started !"),p_ProgramCfg->GetAppName().c_str());
     frame->SetStatusText(Temp0, 0);

+#endif // wxUSE_STATUSBAR

     //---------------------------------------------------------------------------------------
     int width, height;
     frame->GetClientSize(&width, &height);
     //---------------------------------------------------------------------------------------
     //---------------------------------------------------------------------------------------
     int width, height;
     frame->GetClientSize(&width, &height);
     //---------------------------------------------------------------------------------------

-    frame->p_Splitter = new DocSplitterWindow(frame,-1);
+    frame->p_Splitter = new DocSplitterWindow(frame,wxID_ANY);

     // p_Splitter->SetCursor(wxCursor(wxCURSOR_PENCIL));
     frame->pDoc                       = new MainDoc();
     frame->pDoc->p_MainFrame          = frame;
     // p_Splitter->SetCursor(wxCursor(wxCURSOR_PENCIL));
     frame->pDoc                       = new MainDoc();
     frame->pDoc->p_MainFrame          = frame;


@@ -248,23 +250,23 @@ bool MainApp::OnInit(void)  // Does everything needed for a program start
     }
     frame->pDoc->p_Help = frame->p_Help;          // Save the information to the document
     //---------------------------------------------------------------------------------------
     }
     frame->pDoc->p_Help = frame->p_Help;          // Save the information to the document
     //---------------------------------------------------------------------------------------

-    frame->Show(TRUE);                            // Show the frame
+    frame->Show(true);                            // Show the frame

     SetTopWindow(frame);                          // At this point the frame can be seen
     //---------------------------------------------------------------------------------------
     // If you need a "Splash Screen" because of a long OnNewDocument, do it here
     if (!frame->pDoc->OnNewDocument())
     SetTopWindow(frame);                          // At this point the frame can be seen
     //---------------------------------------------------------------------------------------
     // If you need a "Splash Screen" because of a long OnNewDocument, do it here
     if (!frame->pDoc->OnNewDocument())

-        frame->Close(TRUE);
+        frame->Close(true);

     // Kill a "Splash Screen" because OnNewDocument, if you have one
     //---------------------------------------------------------------------------------------
     // Kill a "Splash Screen" because OnNewDocument, if you have one
     //---------------------------------------------------------------------------------------

-    p_ProgramCfg->Flush(TRUE);        // save the configuration
-    return TRUE;
+    p_ProgramCfg->Flush(true);        // save the configuration
+    return true;

 } // bool MainApp::OnInit(void)
 
 //----------------------------------------------------------------------------------------
 // My frame constructor
 //----------------------------------------------------------------------------------------
 MainFrame::MainFrame(wxFrame *frame, wxChar *title,  const wxPoint& pos, const wxSize& size):
 } // bool MainApp::OnInit(void)
 
 //----------------------------------------------------------------------------------------
 // My frame constructor
 //----------------------------------------------------------------------------------------
 MainFrame::MainFrame(wxFrame *frame, wxChar *title,  const wxPoint& pos, const wxSize& size):

-wxFrame(frame, -1, title,  pos, size)
+wxFrame(frame, wxID_ANY, title,  pos, size)

 {
     p_Splitter = NULL; pDoc = NULL; p_Help = NULL;    // Keep the Pointers clean !
     //--- Everything else is done in MainApp::OnInit() --------------------------------------
 {
     p_Splitter = NULL; pDoc = NULL; p_Help = NULL;    // Keep the Pointers clean !
     //--- Everything else is done in MainApp::OnInit() --------------------------------------


@@ -275,7 +277,7 @@ MainFrame::~MainFrame(void)
 {
     // Close the help frame; this will cause the config data to get written.
     if (p_Help->GetFrame()) // returns NULL if no help frame active
 {
     // Close the help frame; this will cause the config data to get written.
     if (p_Help->GetFrame()) // returns NULL if no help frame active

-        p_Help->GetFrame()->Close(TRUE);
+        p_Help->GetFrame()->Close(true);

     delete p_Help;  // Memory Leak
     p_Help = NULL;
     // save the control's values to the config
     delete p_Help;  // Memory Leak
     p_Help = NULL;
     // save the control's values to the config


@@ -294,7 +296,7 @@ MainFrame::~MainFrame(void)
     // Get() it doesn't try to create one if there is none (definitely not what
     // we want here!)
     // delete wxConfigBase::Set((wxConfigBase *) NULL);
     // Get() it doesn't try to create one if there is none (definitely not what
     // we want here!)
     // delete wxConfigBase::Set((wxConfigBase *) NULL);

-    p_ProgramCfg->Flush(TRUE);        // saves   Objekt
+    p_ProgramCfg->Flush(true);        // saves   Objekt

     if (pDoc)                         // If we have a Valid Document
         delete pDoc;                     // Cleanup (MainDoc::~MainDoc)
 } // MainFrame::~MainFrame(void)
     if (pDoc)                         // If we have a Valid Document
         delete pDoc;                     // Cleanup (MainDoc::~MainDoc)
 } // MainFrame::~MainFrame(void)


@@ -302,7 +304,7 @@ MainFrame::~MainFrame(void)
 //----------------------------------------------------------------------------------------
 void MainFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 //----------------------------------------------------------------------------------------
 void MainFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    Close(TRUE);
+    Close(true);

 }
 
 //----------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------