Changed defined(__DARWIN__) to (defined(__DARWIN__) && defined(__WXMAC__))

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

diff --git a/demos/dbbrowse/dlguser.h b/demos/dbbrowse/dlguser.h
index 859da2c34d9e4bc0f4e2b09b34176eda47732909..35d774b9d3b0bb5bf78401c55ad12f66a7c97f6a 100644 (file)
--- a/demos/dbbrowse/dlguser.h
+++ b/demos/dbbrowse/dlguser.h
@@ -1,33 +1,39 @@
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 // Name:        DlgUser.h,cpp
 // Purpose:     Dialog mit Variable Gestaltung durch DlgUser.wxr
-// Author:      Mark Johnson, mj10777@gmx.net
+// Author:      Mark Johnson
 // Modified by: 19991105.mj10777
 // Created:     19991105
 // Copyright:   (c) Mark Johnson
 // Licence:     wxWindows license
-//---------------------------------------------------------------------------
+// RCS-ID:      $Id$
+//----------------------------------------------------------------------------------------
 // DlgUser
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
 #define ID_DIALOG_DSN   100
 #define ID_DSN          101
 #define ID_USER         102
 #define ID_PASSWORD     103
 #define ID_TEXT         104
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------------------
+class MainDoc;
+
+//----------------------------------------------------------------------------------------
 class DlgUser: public wxDialog
 {
- public:
- bool canceled;
- wxString s_DSN, s_User, s_Password;
- wxTextCtrl *tc_User, *tc_Password;
- //---------------------------------------------------------------------------
- DlgUser(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size,const long style = wxDEFAULT_DIALOG_STYLE);
- void OnInit();
- void OnOk(wxCommandEvent& event);
- void OnCancel(wxCommandEvent& event);
- //---------------------------------------------------------------------------
-  DECLARE_EVENT_TABLE()
+public:
+    wxString s_DSN, s_User, s_Password;
+    wxStaticText *m_Label1, *m_Label2;
+    wxTextCtrl *m_UserName, *m_Password;
+    wxButton *m_OK, *m_Cancel;
+    MainDoc *pDoc;
+    //---------------------------------------------------------------------------------------
+    DlgUser(wxWindow *parent,MainDoc *pDoc, const wxString& title);
+    void OnInit();
+    void OnOk(wxCommandEvent& event);
+    //---------------------------------------------------------------------------------------
+
+    DECLARE_EVENT_TABLE()
 };
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------