Listctrl updates

[wxWidgets.git] / include / wx / tbarsmpl.h

diff --git a/include/wx/tbarsmpl.h b/include/wx/tbarsmpl.h
index 7b44d3f1099954a52b2f0dc494816654c3a54d2a..2e4911aee15c2c29218361d35c3c4f6569d0a35c 100644 (file)
--- a/include/wx/tbarsmpl.h
+++ b/include/wx/tbarsmpl.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __TBARSMPLH__
-#define __TBARSMPLH__
+#ifndef _WX_TBARSMPLH__
+#define _WX_TBARSMPLH__

 
 #ifdef __GNUG__
 #pragma interface "tbarsmpl.h"
 
 #ifdef __GNUG__
 #pragma interface "tbarsmpl.h"


@@ -18,12 +18,14 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if USE_TOOLBAR
+#if wxUSE_TOOLBAR

 
 #include "wx/bitmap.h"
 #include "wx/list.h"
 #include "wx/tbarbase.h"
 
 
 #include "wx/bitmap.h"
 #include "wx/list.h"
 #include "wx/tbarbase.h"
 

+class WXDLLEXPORT wxMemoryDC;
+

 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
 WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
 WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
 WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
 WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;


@@ -73,7 +75,7 @@ DECLARE_EVENT_TABLE()
 
 };
 
 
 };
 

-#endif // USE_TOOLBAR
+#endif // wxUSE_TOOLBAR

 #endif
 #endif

-    // __TBARSMPLH__
+    // _WX_TBARSMPLH__