diff --git a/demos/dbbrowse/dbbrowse.cpp b/demos/dbbrowse/dbbrowse.cpp
index f93ca6d677..090073bd2d 100644
--- a/demos/dbbrowse/dbbrowse.cpp
+++ b/demos/dbbrowse/dbbrowse.cpp
@@ -262,7 +262,8 @@ bool MainApp::OnInit(void)  // Does everything needed for a program start
 MainFrame::MainFrame(wxFrame *frame, char *title,  const wxPoint& pos, const wxSize& size):
   wxFrame(frame, -1, title,  pos, size)
 {
- //--- Everything is done in MainApp -----------------------------------------------------
+ p_Splitter = NULL; pDoc = NULL; p_Help = NULL;    // Keep the Pointers clean !
+ //--- Everything else is done in MainApp::OnInit() --------------------------------------
 }
 //----------------------------------------------------------------------------------------
 MainFrame::~MainFrame(void)
@@ -284,8 +285,8 @@ MainFrame::~MainFrame(void)
  // we want here!)
  // delete wxConfigBase::Set((wxConfigBase *) NULL);
  p_ProgramCfg->Flush(TRUE);        // saves   Objekt
- if (!frame->pDoc)                 // If we have a Valid Document
-  delete frame->pDoc;              // Cleanup (MainDoc::~MainDoc)
+ if (pDoc)                         // If we have a Valid Document
+  delete pDoc;                     // Cleanup (MainDoc::~MainDoc)
 } // MainFrame::~MainFrame(void)
 //----------------------------------------------------------------------------------------
 void MainFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
diff --git a/demos/dbbrowse/dbbrowse.h b/demos/dbbrowse/dbbrowse.h
index 3850290e25..0949892916 100644
--- a/demos/dbbrowse/dbbrowse.h
+++ b/demos/dbbrowse/dbbrowse.h
@@ -27,15 +27,15 @@ class MainFrame: public wxFrame
 
  public:
   // menu callbacks
-  void OnQuit(wxCommandEvent& event);
   void OnAbout(wxCommandEvent& event);
   void OnHelp(wxCommandEvent& event);
+  void OnQuit(wxCommandEvent& event);
   //--------------------------------------------------------------------------------------
-  wxHtmlHelpController *p_Help;
+  int DiffW, DiffH;                  // Needed the saving of Frame size
   //--------------------------------------------------------------------------------------
-  int DiffW, DiffH;
-  MainDoc *pDoc;
-  DocSplitterWindow *p_Splitter;
+  DocSplitterWindow    *p_Splitter;  // for Document Views
+  MainDoc              *pDoc;        // Self made Document
+  wxHtmlHelpController *p_Help;      // Help System
   //--------------------------------------------------------------------------------------
  DECLARE_EVENT_TABLE()
 };