fix for dmc compilation of projects with more than one obj

[wxWidgets.git] / samples / dialogs / dialogs.h

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 5c3396b96b2c9c15aa49e0f147b882aa0b051be6..dda293bf167e03b2479dfa2727a7a55e6005600b 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -44,8 +44,9 @@ public:
     void OnButton(wxCommandEvent& event);
 
 private:
     void OnButton(wxCommandEvent& event);
 
 private:

-    wxButton *m_btnFocused;
-    wxButton *m_btnDelete;
+    wxButton *m_btnModal,
+             *m_btnModeless,
+             *m_btnDelete;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -71,6 +72,7 @@ public:
     void FilesOpen(wxCommandEvent& event);
     void FileSave(wxCommandEvent& event);
     void DirChoose(wxCommandEvent& event);
     void FilesOpen(wxCommandEvent& event);
     void FileSave(wxCommandEvent& event);
     void DirChoose(wxCommandEvent& event);

+    void DirChooseNew(wxCommandEvent& event);

     void GenericDirChoose(wxCommandEvent& event);
     void ShowTip(wxCommandEvent& event);
     void ModalDlg(wxCommandEvent& event);
     void GenericDirChoose(wxCommandEvent& event);
     void ShowTip(wxCommandEvent& event);
     void ModalDlg(wxCommandEvent& event);


@@ -96,10 +98,15 @@ public:
     void OnExit(wxCommandEvent& event);
 
 private:
     void OnExit(wxCommandEvent& event);
 
 private:

+    void DoDirChoose(int style);
+

     MyModelessDialog *m_dialog;
 
 #if wxUSE_FINDREPLDLG
     wxFindReplaceData m_findData;
     MyModelessDialog *m_dialog;
 
 #if wxUSE_FINDREPLDLG
     wxFindReplaceData m_findData;

+
+    wxFindReplaceDialog *m_dlgFind,
+                        *m_dlgReplace;

 #endif // wxUSE_FINDREPLDLG
 
     DECLARE_EVENT_TABLE()
 #endif // wxUSE_FINDREPLDLG
 
     DECLARE_EVENT_TABLE()


@@ -108,7 +115,8 @@ private:
 class MyCanvas: public wxScrolledWindow
 {
 public:
 class MyCanvas: public wxScrolledWindow
 {
 public:

-    MyCanvas(wxWindow *parent) : wxScrolledWindow(parent) { }
+    MyCanvas(wxWindow *parent) : 
+       wxScrolledWindow(parent,-1,wxDefaultPosition,wxDefaultSize,wxNO_FULL_REPAINT_ON_RESIZE) { }

 
     void OnPaint(wxPaintEvent& event);
 
 
     void OnPaint(wxPaintEvent& event);
 


@@ -133,6 +141,7 @@ enum
     DIALOGS_FILES_OPEN,
     DIALOGS_FILE_SAVE,
     DIALOGS_DIR_CHOOSE,
     DIALOGS_FILES_OPEN,
     DIALOGS_FILE_SAVE,
     DIALOGS_DIR_CHOOSE,

+    DIALOGS_DIRNEW_CHOOSE,

     DIALOGS_GENERIC_DIR_CHOOSE,
     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,
     DIALOGS_GENERIC_DIR_CHOOSE,
     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,