merged in the commit from the 2.2 branch

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

diff --git a/demos/dbbrowse/dbbrowse.h b/demos/dbbrowse/dbbrowse.h
index 13f8571891966479a259f4bee18fa0b1dcd1213e..12596fdf9002f9f7ca10668303b267025778f33e 100644 (file)
--- a/demos/dbbrowse/dbbrowse.h
+++ b/demos/dbbrowse/dbbrowse.h
@@ -8,15 +8,6 @@
 // Licence:     wxWindows license
 // RCS-ID:      $Id$
 //----------------------------------------------------------------------------------------
 // Licence:     wxWindows license
 // RCS-ID:      $Id$
 //----------------------------------------------------------------------------------------

-// Define a new application type
-//----------------------------------------------------------------------------------------
-class MainApp: public wxApp
-{
- public:
-  bool OnInit(void); // Programmstart
-  wxLocale m_locale; // locale we'll be using and language support
-};
-//----------------------------------------------------------------------------------------

 // Define a new frame type
 //----------------------------------------------------------------------------------------
 class MainFrame: public wxFrame
 // Define a new frame type
 //----------------------------------------------------------------------------------------
 class MainFrame: public wxFrame


@@ -27,19 +18,29 @@ class MainFrame: public wxFrame
 
  public:
   // menu callbacks
 
  public:
   // menu callbacks

-  void OnQuit(wxCommandEvent& event);

   void OnAbout(wxCommandEvent& event);
   void OnHelp(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;
-  mjDoc *pDoc;
-  DocSplitterWindow *p_Splitter;
+  DocSplitterWindow    *p_Splitter;  // for Document Views
+  MainDoc              *pDoc;        // Self made Document
+  wxHtmlHelpController *p_Help;      // Help System

   //--------------------------------------------------------------------------------------
  DECLARE_EVENT_TABLE()
 };
 //----------------------------------------------------------------------------------------
   //--------------------------------------------------------------------------------------
  DECLARE_EVENT_TABLE()
 };
 //----------------------------------------------------------------------------------------

+// Define a new application type
+//----------------------------------------------------------------------------------------
+class MainApp: public wxApp
+{
+ public:
+  MainFrame *frame;                           // The one and only MainFrame
+  bool OnInit(void); // Programmstart
+  wxLocale m_locale; // locale we'll be using and language support - MUST be here !
+};
+//----------------------------------------------------------------------------------------

 // ID for the menu quit command
 //----------------------------------------------------------------------------------------
 #define QUIT                         777
 // ID for the menu quit command
 //----------------------------------------------------------------------------------------
 #define QUIT                         777