Minor changes

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

src/generic/caret.cpp

@@ -17,8 +17,8 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if 0 //def __GNUG__
-    #pragma implementation "caret.h"
+#ifdef __GNUG__
+#pragma implementation "caret.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -46,6 +46,16 @@ static int gs_blinkTime = 500;  // in milliseconds
 // implementation
 // ============================================================================
 
+wxCaretTimer::wxCaretTimer(wxCaret *caret) 
+{ 
+    m_caret = caret; 
+}
+
+void wxCaretTimer::Notify() 
+{ 
+    m_caret->Blink(); 
+}
+
 // ----------------------------------------------------------------------------
 // wxCaret static functions and data
 // ----------------------------------------------------------------------------

src/msw/Makefile.am

@@ -4,8 +4,8 @@
 ##
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = 1.3
-# no-dependencies
+AUTOMAKE_OPTIONS =
+# 1.3 no-dependencies
 
 SUFFIXES = .cpp .c
 

src/unix/threadpsx.cpp

@@ -100,12 +100,18 @@ public:
 
 wxMutex::wxMutex()
 {
+    p_internal = new wxMutexInternal;
+    
+#if 0
+    /* I don't know where this function is supposed to exist,
+       and NP actually means non-portable, RR. */
     pthread_mutexattr_t attr_type;
-
     pthread_mutexattr_settype( &attr_type, PTHREAD_MUTEX_FAST_NP );
 
-    p_internal = new wxMutexInternal;
     pthread_mutex_init( &(p_internal->p_mutex), (const pthread_mutexattr_t*) &attr_type );
+#else
+    pthread_mutex_init( &(p_internal->p_mutex), (const pthread_mutexattr_t*) NULL );
+#endif
     m_locked = 0;
 }