don't strip &s from tooltips (patch 1488318)

[wxWidgets.git] / src / gtk / frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index e35a025f7a0a2cacf700dc346dc42d28956d7f9e..34e6b9de37542817c4f06d1d8e459f77e1c374e3 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        frame.cpp
+// Name:        src/gtk/frame.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,6 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -15,23 +18,22 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
+#include "wx/frame.h"

 
 

-#include "wx/defs.h"
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/menu.h"
+    #include "wx/dialog.h"
+    #include "wx/control.h"
+#endif // WX_PRECOMP

 
 

-#include "wx/frame.h"
-#include "wx/dialog.h"
-#include "wx/control.h"
-#include "wx/app.h"
-#include "wx/menu.h"

 #if wxUSE_TOOLBAR
     #include "wx/toolbar.h"
 #endif
 #if wxUSE_STATUSBAR
     #include "wx/statusbr.h"
 #endif
 #if wxUSE_TOOLBAR
     #include "wx/toolbar.h"
 #endif
 #if wxUSE_STATUSBAR
     #include "wx/statusbr.h"
 #endif

-#include "wx/dcclient.h"

 
 #include <glib.h>
 #include "wx/gtk/private.h"
 
 #include <glib.h>
 #include "wx/gtk/private.h"