Removed warning for Darwin compilation from datetime.inl

  Added wxFileName::SetPath() and set m_relative if no dir is given
  Corrected wxFrame::Enable() in wxMac.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/datetime.inl b/include/wx/datetime.inl
index 10e929a22a7349e7c6144d3a1c4a23c3c46786d0..8ec379dd9d2a212f961120789e83e8ed0f6d17d4 100644 (file)
--- a/include/wx/datetime.inl
+++ b/include/wx/datetime.inl
@@ -54,12 +54,12 @@ inline wxDateTime wxDateTime::Now()
 /* static */
 inline wxDateTime wxDateTime::Today()
 {
 /* static */
 inline wxDateTime wxDateTime::Today()
 {

-    struct tm *tm = GetTmNow();
-    tm->tm_hour =
-    tm->tm_min =
-    tm->tm_sec = 0;
+    struct tm *time = GetTmNow();
+    time->tm_hour = 0;
+    time->tm_min = 0;
+    time->tm_sec = 0;

 
 

-    return wxDateTime(*tm);
+    return wxDateTime(*time);

 }
 
 #if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
 }
 
 #if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))

diff --git a/include/wx/filename.h b/include/wx/filename.h
index 4128075623521cdd56c2f652d0d496e0cf03b807..844c2d49165cbd5dfe901a36cf383a9211731164 100644 (file)
--- a/include/wx/filename.h
+++ b/include/wx/filename.h
@@ -259,8 +259,6 @@ public:
     bool operator==(const wxString& filename)
         { return *this == wxFileName(filename); }
 
     bool operator==(const wxString& filename)
         { return *this == wxFileName(filename); }
 

-    // Tests
-

         // are the file names of this type cases sensitive?
     static bool IsCaseSensitive( wxPathFormat format = wxPATH_NATIVE );
 
         // are the file names of this type cases sensitive?
     static bool IsCaseSensitive( wxPathFormat format = wxPATH_NATIVE );
 


@@ -271,6 +269,12 @@ public:
         // is this filename relative?
     bool IsRelative() const
         { return m_relative; }
         // is this filename relative?
     bool IsRelative() const
         { return m_relative; }

+        
+        // forcibly set the flag
+    void SetAbsolute()
+        { m_relative = FALSE; }
+    void SetRelative()
+        { m_relative = TRUE; }

 
     // Information about path format
 
 
     // Information about path format
 


@@ -315,6 +319,8 @@ public:
     // Construct path only - possibly with the trailing separator
     wxString GetPath( bool add_separator = FALSE,
                       wxPathFormat format = wxPATH_NATIVE ) const;
     // Construct path only - possibly with the trailing separator
     wxString GetPath( bool add_separator = FALSE,
                       wxPathFormat format = wxPATH_NATIVE ) const;

+    // Replace current path with this one
+    void SetPath( const wxString &path, wxPathFormat format = wxPATH_NATIVE );

 
     // more readable synonym
     wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const
 
     // more readable synonym
     wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const

diff --git a/include/wx/mac/frame.h b/include/wx/mac/frame.h
index 39498bd06bb4df241c15538cf4ccf474a7fab42f..940b8b957cb21aa41bb8ec2ba34915ac10952892 100644 (file)
--- a/include/wx/mac/frame.h
+++ b/include/wx/mac/frame.h
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_FRAME_H_


@@ -60,7 +60,7 @@ public:
     // -------------------------------
 
     // override some more virtuals
     // -------------------------------
 
     // override some more virtuals

-       virtual bool Enable(bool enable) ;
+    virtual bool Enable(bool enable = TRUE) ;

 
     // get the origin of the client area (which may be different from (0, 0)
     // if the frame has a toolbar) in client coordinates
 
     // get the origin of the client area (which may be different from (0, 0)
     // if the frame has a toolbar) in client coordinates

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index aae38ea3ef4ee4fe02ee62a53131f59e9b40b3c7..47d1dcf0a5c4c76136c7a7d8085bccdbd83b65ed 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -231,6 +231,15 @@ void wxFileName::Assign(const wxString& volume,
                         const wxString& name,
                         const wxString& ext,
                         wxPathFormat format )
                         const wxString& name,
                         const wxString& ext,
                         wxPathFormat format )

+{
+    SetPath( path, format );
+
+    m_volume = volume;
+    m_ext = ext;
+    m_name = name;
+}
+
+void wxFileName::SetPath( const wxString &path, wxPathFormat format )

 {
     wxPathFormat my_format = GetFormat( format );
     wxString my_path = path;
 {
     wxPathFormat my_format = GetFormat( format );
     wxString my_path = path;


@@ -297,10 +306,10 @@ void wxFileName::Assign(const wxString& volume,
             }
         }
     }
             }
         }
     }

-
-    m_volume = volume;
-    m_ext = ext;
-    m_name = name;
+    else
+    {
+        m_relative = TRUE;
+    }

 }
 
 void wxFileName::Assign(const wxString& fullpath,
 }
 
 void wxFileName::Assign(const wxString& fullpath,