Added sort order and alignement for column headers.

[wxWidgets.git] / include / wx / gtk / taskbarpriv.h

diff --git a/include/wx/gtk/taskbarpriv.h b/include/wx/gtk/taskbarpriv.h
index e2bb1da53b56dfb932bc4d006c45a940500fd495..d50e861f460113e58818e23d68bca123f3926fcc 100644 (file)
--- a/include/wx/gtk/taskbarpriv.h
+++ b/include/wx/gtk/taskbarpriv.h
@@ -9,15 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_TASKBARPRIV_H_
-#define _WX_TASKBARPRIV_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "taskbarpriv.h"
-#endif
+#ifndef _WX_GTK_TASKBARPRIV_H_
+#define _WX_GTK_TASKBARPRIV_H_

 
 #include "wx/toplevel.h"
 
 #include "wx/toplevel.h"

-#include "wx/bitmap.h"

 
 #ifdef __WXGTK20__
 #include <gtk/gtkversion.h>
 
 #ifdef __WXGTK20__
 #include <gtk/gtkversion.h>


@@ -32,7 +27,8 @@ public:
     bool IsProtocolSupported();
     
     wxEvtHandler *m_invokingWindow;
     bool IsProtocolSupported();
     
     wxEvtHandler *m_invokingWindow;

-    
+
+protected:

 #if wxUSE_MENUS_NATIVE
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 #endif // wxUSE_MENUS_NATIVE
 #if wxUSE_MENUS_NATIVE
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 #endif // wxUSE_MENUS_NATIVE


@@ -40,4 +36,4 @@ public:
 
 #endif // __WXGTK20__
 #endif // GTK_CHECK_VERSION(2, 1, 0)
 
 #endif // __WXGTK20__
 #endif // GTK_CHECK_VERSION(2, 1, 0)

-#endif // _WX_TASKBARPRIV_H_
+#endif // _WX_GTK_TASKBARPRIV_H_