Store a pointer to the wxWindow in the wxWindowDC class

[wxWidgets.git] / include / wx / cmdline.h

diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index 498752cb476f781825aaa1d9d55c28ac540c38fd..ccfe008b4e91992b6d7aacf7d234298494b5fc19 100644 (file)
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -7,13 +7,13 @@
 // Created:     04.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     04.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

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

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CMDLINE_H_
 #define _WX_CMDLINE_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CMDLINE_H_
 #define _WX_CMDLINE_H_
 

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

     #pragma interface "cmdline.h"
 #endif
 
     #pragma interface "cmdline.h"
 #endif
 


@@ -22,8 +22,9 @@
 #if wxUSE_CMDLINE_PARSER
 
 #include "wx/string.h"
 #if wxUSE_CMDLINE_PARSER
 
 #include "wx/string.h"

+#include "wx/arrstr.h"

 
 

-class WXDLLEXPORT wxDateTime;
+class WXDLLIMPEXP_BASE wxDateTime;

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -92,7 +93,7 @@ struct wxCmdLineEntryDesc
 // 4. use GetXXX() to retrieve the parsed info
 // ----------------------------------------------------------------------------
 
 // 4. use GetXXX() to retrieve the parsed info
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxCmdLineParser
+class WXDLLIMPEXP_BASE wxCmdLineParser

 {
 public:
     // ctors and initializers
 {
 public:
     // ctors and initializers


@@ -131,6 +132,8 @@ public:
     void EnableLongOptions(bool enable = TRUE);
     void DisableLongOptions() { EnableLongOptions(FALSE); }
 
     void EnableLongOptions(bool enable = TRUE);
     void DisableLongOptions() { EnableLongOptions(FALSE); }
 

+    bool AreLongOptionsEnabled();
+

     // extra text may be shown by Usage() method if set by this function
     void SetLogo(const wxString& logo);
 
     // extra text may be shown by Usage() method if set by this function
     void SetLogo(const wxString& logo);
 


@@ -184,9 +187,11 @@ public:
     // the value in the provided pointer
     bool Found(const wxString& name, long *value) const;
 
     // the value in the provided pointer
     bool Found(const wxString& name, long *value) const;
 

+#if wxUSE_DATETIME

     // returns TRUE if an option taking a date value was found and stores the
     // value in the provided pointer
     bool Found(const wxString& name, wxDateTime *value) const;
     // returns TRUE if an option taking a date value was found and stores the
     // value in the provided pointer
     bool Found(const wxString& name, wxDateTime *value) const;

+#endif // wxUSE_DATETIME

 
     // gets the number of parameters found
     size_t GetParamCount() const;
 
     // gets the number of parameters found
     size_t GetParamCount() const;


@@ -201,17 +206,22 @@ public:
     static wxArrayString ConvertStringToArgs(const wxChar *cmdline);
 
 private:
     static wxArrayString ConvertStringToArgs(const wxChar *cmdline);
 
 private:

+    // get usage string
+    wxString GetUsageString();
+

     // common part of all ctors
     void Init();
 
     struct wxCmdLineParserData *m_data;
     // common part of all ctors
     void Init();
 
     struct wxCmdLineParserData *m_data;

+
+    DECLARE_NO_COPY_CLASS(wxCmdLineParser)

 };
 
 #else // !wxUSE_CMDLINE_PARSER
 
 // this function is always available (even if !wxUSE_CMDLINE_PARSER) because it
 // is used by wxWin itself under Windows
 };
 
 #else // !wxUSE_CMDLINE_PARSER
 
 // this function is always available (even if !wxUSE_CMDLINE_PARSER) because it
 // is used by wxWin itself under Windows

-class WXDLLEXPORT wxCmdLineParser
+class WXDLLIMPEXP_BASE wxCmdLineParser

 {
 public:
     static wxArrayString ConvertStringToArgs(const wxChar *cmdline);
 {
 public:
     static wxArrayString ConvertStringToArgs(const wxChar *cmdline);