Additions to wxTime; always inits OLE now in wxMSW

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

src/common/time.cpp

@@ -271,6 +271,38 @@ secondTy wxTime::GetSecond() const
 		  return (secondTy)(((sec % 86400) % 3600) % 60);
 }
 
+secondTy wxTime::GetSecondGMT() const
+/*
+        Return the minute of this wxTime in GMT.
+*/
+{
+        return (secondTy)(((sec % 86400) % 3600) % 60);
+}
+
+int wxTime::GetDay() const
+{
+    wxDate da((wxDate) *this);
+    return da.GetDay();
+}
+
+int wxTime::GetDayOfWeek() const
+{
+    wxDate da((wxDate) *this);
+    return da.GetDayOfWeek();
+}
+
+int wxTime::GetMonth() const
+{
+    wxDate da((wxDate) *this);
+    return da.GetMonth();
+}
+
+int wxTime::GetYear() const
+{
+    wxDate da((wxDate) *this);
+    return da.GetYear();
+}
+
 wxTime wxTime::Max(const wxTime& t) const
 {
         if (t < *this) return *this;

src/msw/app.cpp

@@ -154,11 +154,26 @@ bool wxApp::Initialize()
     }
 #endif
 
-  #if  defined(WX_DRAG_DROP)
+    int iMsg = 96;
+			
+   // for OLE, enlarge message queue to be as large as possible
+   while (!SetMessageQueue(iMsg) && (iMsg -= 8));
+
+/*
+    DWORD dwOleVer;
+    dwOleVer = CoBuildVersion();
+	
+    // check the OLE library version
+    if (rmm != HIWORD(dwOleVer))
+    {
+        wxMessageBox("Incorrect version of OLE libraries.");
+        return FALSE;
+    }
+*/
+	
     // we need to initialize OLE library
     if ( FAILED(::OleInitialize(NULL)) )
       wxFatalError(_("Cannot initialize OLE"));
-  #endif
 
 #if CTL3D
     if (!Ctl3dRegister(wxhInstance))
@@ -471,9 +486,7 @@ void wxApp::CleanUp()
   if ( wxDisableButtonBrush )
     ::DeleteObject( wxDisableButtonBrush ) ;
 
-#if     defined(WX_DRAG_DROP)
   ::OleUninitialize();
-#endif
 
 #if CTL3D
   Ctl3dUnregister(wxhInstance);

src/msw/makefile.b32

@@ -239,6 +239,9 @@ MSWOBJS = \
   $(MSWDIR)\dataobj.obj \
   $(MSWDIR)\uuid.obj
 
+# Unfortunately this causes a crash when the oleauto sample starts.
+#  $(MSWDIR)\automtn.obj
+
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 default:	wx
@@ -456,6 +459,8 @@ $(MSWDIR)\oleutils.obj:     $(OLEDIR)\oleutils.$(SRCSUFF)
 
 $(MSWDIR)\uuid.obj:     $(OLEDIR)\uuid.$(SRCSUFF)
 
+$(MSWDIR)\automtn.obj:     $(OLEDIR)\automtn.$(SRCSUFF)
+
 ########################################################
 # Common objects (always compiled)
 

src/msw/makefile.g95

@@ -228,7 +228,8 @@ MSWOBJS = \
 #  $(OLEDIR)/dropsrc.$(OBJSUFF) \
 #  $(OLEDIR)/dataobj.$(OBJSUFF) \
 #  $(OLEDIR)/oleutils.$(OBJSUFF) \
-#  $(OLEDIR)/uuid.$(OBJSUFF)
+#  $(OLEDIR)/uuid.$(OBJSUFF) \
+#  $(OLEDIR)/automtn.$(OBJSUFF)
 
 XPMOBJECTS = 	$(XPMDIR)/crbuffri.o\
 		$(XPMDIR)/crdatfri.o\

src/msw/makefile.nt

@@ -219,7 +219,8 @@ MSWOBJS = \
   $(OLEDIR)\dropsrc.obj \
   $(OLEDIR)\dataobj.obj \
   $(OLEDIR)\oleutils.obj \
-  $(OLEDIR)\uuid.obj
+  $(OLEDIR)\uuid.obj \
+  $(OLEDIR)\automtn.obj
 
 XPMOBJECTS = 	$(XPMDIR)\crbuffri.obj\
 		$(XPMDIR)\crdatfri.obj\
@@ -739,6 +740,12 @@ $(OLEDIR)/uuid.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
 <<
 
+$(OLEDIR)/automtn.obj:     $*.$(SRCSUFF)
+        echo $(CPPFLAGS)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
 ########################################################
 # Common objects (always compiled)