don't wake up on Windows messages when waiting for thread termination in a console...

[wxWidgets.git] / contrib / include / wx / deprecated / resource.h

diff --git a/contrib/include/wx/deprecated/resource.h b/contrib/include/wx/deprecated/resource.h
index e7c749bcb38846946466046bb850b1225e979bb5..45164fd83d7a87c5b560b152ca59c2bd30a0ca91 100644 (file)
--- a/contrib/include/wx/deprecated/resource.h
+++ b/contrib/include/wx/deprecated/resource.h
@@ -12,10 +12,6 @@
 #ifndef _WX_RESOURCEH__
 #define _WX_RESOURCEH__
 
 #ifndef _WX_RESOURCEH__
 #define _WX_RESOURCEH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "resource.h"
-#endif
-

 #include "wx/setup.h"
 #include "wx/deprecated/setup.h"
 
 #include "wx/setup.h"
 #include "wx/deprecated/setup.h"
 


@@ -202,10 +198,10 @@ WXDLLIMPEXP_DEPRECATED extern bool wxResourceAddIdentifier(const wxString& name,
 WXDLLIMPEXP_DEPRECATED extern int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table = (wxResourceTable *) NULL);
 
 // Used to be wxWindowBase::LoadFromResource
 WXDLLIMPEXP_DEPRECATED extern int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table = (wxResourceTable *) NULL);
 
 // Used to be wxWindowBase::LoadFromResource

-bool wxLoadFromResource(wxWindow* thisWindow, wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = (const wxResourceTable *) NULL);
+WXDLLIMPEXP_DEPRECATED bool wxLoadFromResource(wxWindow* thisWindow, wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = (const wxResourceTable *) NULL);

 
 // Used to be wxWindowBase::CreateItem
 
 // Used to be wxWindowBase::CreateItem

-wxControl *wxCreateItem(wxWindow* thisWindow, const wxItemResource *resource, const wxItemResource* parentResource, const wxResourceTable *table = (const wxResourceTable *) NULL);
+WXDLLIMPEXP_DEPRECATED wxControl *wxCreateItem(wxWindow* thisWindow, const wxItemResource *resource, const wxItemResource* parentResource, const wxResourceTable *table = (const wxResourceTable *) NULL);

 
 #if defined(__WXPM__)
 #include "wx/os2/wxrsc.h"
 
 #if defined(__WXPM__)
 #include "wx/os2/wxrsc.h"