Added missing header and missing logic. :)

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

diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index c1e35efc792da8958a1008ed2865f3bb6c404e9d..3b2ff4bf0e336f7a232a66d556f32d229e0687ad 100644 (file)
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -281,10 +281,12 @@ wxDLManifestEntry::wxDLManifestEntry( const wxString &libname )
 
 wxDLManifestEntry::~wxDLManifestEntry()
 {
-    UnregisterModules();
-    RestoreClassInfo();
-
-    wxDllLoader::UnloadLibrary(m_handle);
+    if( m_handle != 0 )
+    {
+        UnregisterModules();
+        RestoreClassInfo();
+        wxDllLoader::UnloadLibrary(m_handle);
+    }
 }
 
 bool wxDLManifestEntry::UnrefLib()
@@ -460,7 +462,7 @@ wxDLManifestEntry *wxDynamicLibrary::Link(const wxString &libname)
         }
         else
         {
-            wxCHECK_MSG( !entry->UnrefLib(), 0,
+            wxCHECK_MSG( entry->UnrefLib(), 0,
                          _T("Currently linked library is, ..not loaded??") );
             entry = 0;
         }

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index d0b940a5c176e75d1b5f8af64946a4ce84cd8bdc..c8e3bec3614340d76f805b61a7b25e6483ddd240 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -18,18 +18,19 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "fontbase.h"
+#pragma implementation "fontbase.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-    #pragma hdrstop
+#pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/font.h"
+#include "wx/font.h"
+#include "wx/intl.h"
 #endif // WX_PRECOMP
 
 #include "wx/gdicmn.h"