Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

[wxWidgets.git] / src / gtk1 / font.cpp

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 8e9cc337df37f714f5fb2edc28cd0c1f6f96b1b3..57ba87c8463c979ad876047320d64f1b9cb2b45d 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk1/font.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        src/gtk1/font.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -24,11 +23,11 @@
     #include "wx/log.h"
     #include "wx/settings.h"
     #include "wx/gdicmn.h"
     #include "wx/log.h"
     #include "wx/settings.h"
     #include "wx/gdicmn.h"

-    #include "wx/encinfo.h"

     #include "wx/crt.h"
 #endif
 
 #include "wx/fontutil.h"
     #include "wx/crt.h"
 #endif
 
 #include "wx/fontutil.h"

+#include "wx/encinfo.h"

 #include "wx/utils.h"
 #include "wx/tokenzr.h"
 
 #include "wx/utils.h"
 #include "wx/tokenzr.h"