diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index a40687a118..7eef8e4bc0 100644
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTROL_H_
@@ -24,6 +24,7 @@
 class WXDLLEXPORT wxControl: public wxWindow
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
+
 public:
     wxControl();
     ~wxControl();
@@ -36,11 +37,12 @@ public:
 
     // Places item in centre of panel - so can't be used BEFORE panel->Fit()
     void Centre(int direction = wxHORIZONTAL);
-    inline void Callback(const wxFunction function) { m_callback = function; }; // Adds callback
+    void Callback(const wxFunction function) { m_callback = function; }; // Adds callback
 
-    inline wxFunction GetCallback() { return m_callback; }
+    wxFunction GetCallback() { return m_callback; }
+
+    bool InSetValue() const { return m_inSetValue; }
 
-    inline bool InSetValue() const { return m_inSetValue; }
 protected:
     wxFunction          m_callback;     // Callback associated with the window
 
diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 48519f37d2..a58293df0e 100644
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -49,10 +49,11 @@
 
 extern char *wxBuffer;
 extern wxList wxPendingDelete;
+
 #if wxUSE_THREADS
 extern wxList wxPendingEvents;
-extern wxList wxPendingEventsLocker;
-#endif
+extern wxCriticalSection wxPendingEventsLocker;
+#endif // wxUSE_THREADS
 
 wxApp *wxTheApp = NULL;
 
@@ -494,7 +495,7 @@ void wxApp::DeletePendingObjects()
 
 #if wxUSE_THREADS
 void wxApp::ProcessPendingEvents()
-
+{
     wxNode *node = wxPendingEvents.First();
     wxCriticalSectionLocker locker(wxPendingEventsLocker);
 
@@ -507,8 +508,8 @@ void wxApp::ProcessPendingEvents()
         delete node;
         node = wxPendingEvents.First();
     }
-
-#endif
+}
+#endif // wxUSE_THREADS
 
 wxLog* wxApp::CreateLogTarget()
 {
diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index b2a48459f0..47e93405ef 100644
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -462,8 +462,8 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
         size_t len;
         environment = GetIniFile (filename, NULL);
         len = strlen (environment);
-        wxString hostname;
-        if ( wxGetHostName(hostname) )
+        wxString hostname = wxGetHostName();
+        if ( !!hostname )
             strncat(environment, hostname, 1024 - len);
     }
     homeDB = XrmGetFileDatabase (environment);