wxGTK compile fixes for my wxMSW changes

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index e74ffcdeffa5e65d35ca1c35b3739307e7aeadd3..a14930b5b07e4fb16af4ec40eb8c89f53ebdb2d1 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -1,6 +1,9 @@
 #ifndef _WX_DIALOG_H_BASE_
 #define _WX_DIALOG_H_BASE_
 
 #ifndef _WX_DIALOG_H_BASE_
 #define _WX_DIALOG_H_BASE_
 

+#include "wx/defs.h"
+#include "wx/panel.h"
+

 class WXDLLEXPORT wxDialogBase : public wxPanel
 {
 protected:
 class WXDLLEXPORT wxDialogBase : public wxPanel
 {
 protected:

diff --git a/include/wx/gtk/statline.h b/include/wx/gtk/statline.h
index 8cbce8a56597028e937121a16ee8c8cb60d5f0db..e29e20d5d06f4269794f386a4a633f24f82a28fa 100644 (file)
--- a/include/wx/gtk/statline.h
+++ b/include/wx/gtk/statline.h
@@ -47,6 +47,4 @@ public:
             long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr );
 };
 
             long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr );
 };
 

-#endif // wxUSE_STATLINE
-

 #endif // __GTKSTATICLINEH__
 #endif // __GTKSTATICLINEH__

diff --git a/include/wx/gtk1/statline.h b/include/wx/gtk1/statline.h
index 8cbce8a56597028e937121a16ee8c8cb60d5f0db..e29e20d5d06f4269794f386a4a633f24f82a28fa 100644 (file)
--- a/include/wx/gtk1/statline.h
+++ b/include/wx/gtk1/statline.h
@@ -47,6 +47,4 @@ public:
             long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr );
 };
 
             long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr );
 };
 

-#endif // wxUSE_STATLINE
-

 #endif // __GTKSTATICLINEH__
 #endif // __GTKSTATICLINEH__

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index c708a96e2591af62ef89334f537f53c9cdc31068..b7afa8ae6ff736a93cac94f2bd3bee60f7f9e5c8 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -33,7 +33,9 @@
 #ifndef WX_PRECOMP
     #include "wx/dialog.h"
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/dialog.h"
     #include "wx/dcclient.h"

+    #include "wx/intl.h"

     #include "wx/settings.h"
     #include "wx/settings.h"

+    #include "wx/stattext.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------