build fixes

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

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index f27c49d5c5b36e0f23da142faf49daba222076cc..a0f8fbcf3b92c025b97abf133e289b8a397d634f 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __TEXTDLGH_G__
-#define __TEXTDLGH_G__
+#ifndef _WX_TEXTDLGG_H_
+#define _WX_TEXTDLGG_H_
 
 #include "wx/defs.h"
 
@@ -20,6 +20,7 @@
 
 #if wxUSE_VALIDATORS
 #include "wx/valtext.h"
+#include "wx/textctrl.h"
 #endif
 
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
@@ -109,5 +110,4 @@ wxGetPasswordFromUser(const wxString& message,
 
 #endif
     // wxUSE_TEXTDLG
-#endif
-    // __TEXTDLGH_G__
+#endif // _WX_TEXTDLGG_H_

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 7ebc7870694ac22014884cba559ab97b498b04f0..5f85d95c27f624e821003acbed438966ca2a0ff9 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -9,13 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_VALTEXTH__
-#define _WX_VALTEXTH__
+#ifndef _WX_VALTEXT_H_
+#define _WX_VALTEXT_H_
 
 #include "wx/defs.h"
 
 #if wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
 
+class WXDLLIMPEXP_FWD_CORE wxTextEntry;
+
 #include "wx/validate.h"
 
 #define wxFILTER_NONE           0x0000
@@ -93,5 +95,4 @@ private:
 #endif
   // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
 
-#endif
-  // _WX_VALTEXTH__
+#endif // _WX_VALTEXT_H_

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index e7f637ff255c75049ad458cfdb60764170ec7324..0c1eeaba2df15bfbb65ce34867c3c2405dd1c0d1 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -23,6 +23,7 @@
 #ifndef WX_PRECOMP
   #include <stdio.h>
   #include "wx/textctrl.h"
+  #include "wx/combobox.h"
   #include "wx/utils.h"
   #include "wx/msgdlg.h"
   #include "wx/intl.h"