wxMenu compile fix

[wxWidgets.git] / src / generic / tipdlg.cpp

diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp
index 8ea6f3cf6b7af580d49b0fe99aecab0cf7f2582d..3ae7cd8462f0f2d14d826a8f587495999bbb3920 100644 (file)
--- a/src/generic/tipdlg.cpp
+++ b/src/generic/tipdlg.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma implementation "windowbase.h"
+    #pragma implementation "tipdlg.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -34,8 +34,13 @@
     #include "wx/button.h"
     #include "wx/checkbox.h"
     #include "wx/statbox.h"
     #include "wx/button.h"
     #include "wx/checkbox.h"
     #include "wx/statbox.h"

-    #include "wx/statbmp.h"

     #include "wx/dialog.h"
     #include "wx/dialog.h"

+    #include "wx/icon.h"
+    #include "wx/intl.h"
+    #include "wx/layout.h"
+    #include "wx/settings.h"
+    #include "wx/textctrl.h"
+    #include "wx/statbmp.h"

 #endif // WX_PRECOMP
 
 #include "wx/statline.h"
 #endif // WX_PRECOMP
 
 #include "wx/statline.h"


@@ -74,6 +79,13 @@ public:
 
     virtual wxString GetTip();
 };
 
     virtual wxString GetTip();
 };

+
+// Empty implementation for now to keep the linker happy
+wxString wxRegTipProvider::GetTip()
+{
+    return "";
+}
+

 #endif // __WIN32__
 
 // the dialog we show in wxShowTip()
 #endif // __WIN32__
 
 // the dialog we show in wxShowTip()


@@ -175,7 +187,7 @@ wxTipDialog::wxTipDialog(wxWindow *parent,
     wxIcon icon("wxICON_TIP");
 #else
     #include "wx/generic/tip.xpm"
     wxIcon icon("wxICON_TIP");
 #else
     #include "wx/generic/tip.xpm"

-    wxIcon icon(info);
+    wxIcon icon(tipIcon);

 #endif
 
     wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);
 #endif
 
     wxStaticBitmap *bmp = new wxStaticBitmap(this, -1, icon);