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 48f1255630bc393a0202a3bd31e1b24f7484d508..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__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "resource.h"
-#endif
-
 #include "wx/setup.h"
 #include "wx/deprecated/setup.h"
 
@@ -108,7 +104,7 @@ class WXDLLIMPEXP_DEPRECATED wxItemResource: public wxObject
   inline void SetBackgroundColour(const wxColour& col) { m_backgroundColour = col; }
   inline void SetLabelColour(const wxColour& col) { m_labelColour = col; }
   inline void SetButtonColour(const wxColour& col) { m_buttonColour = col; }
-  
+
   inline wxColour& GetBackgroundColour() const { return (wxColour&) m_backgroundColour; }
   inline wxColour& GetLabelColour() const { return (wxColour&) m_labelColour; }
   inline wxColour& GetButtonColour() const { return (wxColour&) m_buttonColour; }
@@ -138,16 +134,16 @@ class WXDLLIMPEXP_DEPRECATED wxItemResource: public wxObject
 /*
  * Resource table (normally only one of these)
  */
- 
+
 class WXDLLIMPEXP_DEPRECATED wxResourceTable: public wxHashTable
 {
   DECLARE_DYNAMIC_CLASS(wxResourceTable)
 
   protected:
-    
+
   public:
     wxHashTable identifiers;
-    
+
     wxResourceTable();
     ~wxResourceTable();
 
@@ -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
-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
-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"