Fixed bug #1163384. Moved the code that handles activating the cell

[wxWidgets.git] / include / wx / msw / dirdlg.h

diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h
index ac2f48971d40b7c703af9f858caada606d58e891..0c44bfb51ec23d0fb8636ce5ebb738be43735475 100644 (file)
--- a/include/wx/msw/dirdlg.h
+++ b/include/wx/msw/dirdlg.h
@@ -6,13 +6,13 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "dirdlg.h"
 #endif
 
 #pragma interface "dirdlg.h"
 #endif
 


@@ -22,28 +22,27 @@ public:
     wxDirDialog(wxWindow *parent,
                 const wxString& message = wxDirSelectorPromptStr,
                 const wxString& defaultPath = wxEmptyString,
     wxDirDialog(wxWindow *parent,
                 const wxString& message = wxDirSelectorPromptStr,
                 const wxString& defaultPath = wxEmptyString,

-                long style = 0,
+                long style = wxDD_DEFAULT_STYLE,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& name = wxDirDialogNameStr);
 
     void SetMessage(const wxString& message) { m_message = message; }
     void SetPath(const wxString& path);
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& name = wxDirDialogNameStr);
 
     void SetMessage(const wxString& message) { m_message = message; }
     void SetPath(const wxString& path);

-    void SetStyle(long style) { m_dialogStyle = style; }
+    void SetStyle(long style) { SetWindowStyle(style); }

 
     wxString GetMessage() const { return m_message; }
     wxString GetPath() const { return m_path; }
 
     wxString GetMessage() const { return m_message; }
     wxString GetPath() const { return m_path; }

-    long GetStyle() const { return m_dialogStyle; }
+    long GetStyle() const { return GetWindowStyle(); }

 
     virtual int ShowModal();
 
 protected:
     wxString    m_message;
 
     virtual int ShowModal();
 
 protected:
     wxString    m_message;

-    long        m_dialogStyle;

     wxString    m_path;
 
 private:
     wxString    m_path;
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxDirDialog)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDirDialog)

 };
 
 #endif
 };
 
 #endif