Fixes to allow compilation with no wchar_t (djgpp probably has a real wchar_t

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

diff --git a/demos/dbbrowse/dbbrowse.h b/demos/dbbrowse/dbbrowse.h
index 32a77850052b61b68eb1126089fec6085591a71c..0bf41ebd3a0dfeba8ea736acbb2cbd6b03cbaea8 100644 (file)
--- a/demos/dbbrowse/dbbrowse.h
+++ b/demos/dbbrowse/dbbrowse.h
@@ -1,55 +1,53 @@
-//------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 // Name:        dbbrowse.h
 // Purpose:     Through ODBC - Databases Browsen
-// Author:      Mark Johnson, mj10777@gmx.net
+// Author:      Mark Johnson
 // Modified by:
 // Created:     19991127
 // Copyright:   (c) Mark Johnson
 // Licence:     wxWindows license
 // RCS-ID:      $Id$
-//---------------------------------------------------------------------------
-// Define a new application type
-//------------------------------------------------------------------------------
-class MyApp: public wxApp
-{
- public:
-  bool OnInit(void);
-  wxLocale m_locale; // locale we'll be using
-};
-//------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 // Define a new frame type
-//------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 class MainFrame: public wxFrame
 {
- public:
-  MainFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
-  ~MainFrame(void);
+public:
+    MainFrame(wxFrame *frame, wxChar *title,  const wxPoint& pos, const wxSize& size);
+    ~MainFrame(void);
 
- public:
-  // menu callbacks
-  void InitializeMenu();
-  void OnQuit(wxCommandEvent& event);
-  void OnAbout(wxCommandEvent& event);
-  void OnHelp(wxCommandEvent& event);
-  //--------------------------------------------------------
-  wxHtmlHelpController help;
-  //--------------------------------------------------------
-  int DiffW, DiffH;
-  mjDoc *pDoc;
-  DocSplitterWindow *p_Splitter;
-  //--------------------------------------------------------
- DECLARE_EVENT_TABLE()
+public:
+    // menu callbacks
+    void OnAbout(wxCommandEvent& event);
+    void OnHelp(wxCommandEvent& event);
+    void OnQuit(wxCommandEvent& event);
+    //--------------------------------------------------------------------------------------
+    int DiffW, DiffH;                  // Needed the saving of Frame size
+    //--------------------------------------------------------------------------------------
+    DocSplitterWindow    *p_Splitter;  // for Document Views
+    MainDoc              *pDoc;        // Self made Document
+    wxHtmlHelpController *p_Help;      // Help System
+
+    //--------------------------------------------------------------------------------------
+    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                           1
-#define ABOUT                          2
-#define HELP                           3
-#define SPLITTER_FRAME               100
-#define SPLITTER_WINDOW              101
+//----------------------------------------------------------------------------------------
 #define TREE_CTRL_PGM                102
 #define GRID_CTRL                    103
 #define TREE_CTRL_DB                 104
 #define GRID_CTRL_DB                 105
-//------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------