projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made wxHeaderCtrl::GetColumn() const to get rid of the const_cast<>s
[wxWidgets.git]
/
include
/
wx
/
x11
/
privx.h
diff --git
a/include/wx/x11/privx.h
b/include/wx/x11/privx.h
index ec522ff28da05090a1434bb3d7b8e454ed7aed62..bf8386d641ae30c9c2468ab77997152c1f6ae2f5 100644
(file)
--- a/
include/wx/x11/privx.h
+++ b/
include/wx/x11/privx.h
@@
-6,7
+6,7
@@
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_PRIVX_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_PRIVX_H_
@@
-26,10
+26,10
@@
#pragma message enable nosimpint
#endif
#pragma message enable nosimpint
#endif
-class wxMouseEvent;
-class wxKeyEvent;
-class wxWindow;
-class wxRegion;
+class
WXDLLIMPEXP_FWD_CORE
wxMouseEvent;
+class
WXDLLIMPEXP_FWD_CORE
wxKeyEvent;
+class
WXDLLIMPEXP_FWD_CORE
wxWindow;
+class
WXDLLIMPEXP_FWD_CORE
wxRegion;
// ----------------------------------------------------------------------------
// key events related functions
// ----------------------------------------------------------------------------
// key events related functions
@@
-38,11
+38,11
@@
class wxRegion;
extern int wxCharCodeXToWX(KeySym keySym);
extern KeySym wxCharCodeWXToX(int id);
extern int wxCharCodeXToWX(KeySym keySym);
extern KeySym wxCharCodeWXToX(int id);
-
int
wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap);
+
WXPixel
wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap);
Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
extern XColor g_itemColors[];
Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
extern XColor g_itemColors[];
-extern int wxComputeColours (Display *display,
wxColour * back,
wxColour * fore);
+extern int wxComputeColours (Display *display,
const wxColour * back, const
wxColour * fore);
// For convenience
inline Display* wxGlobalDisplay() { return (Display*) wxGetDisplay(); }
// For convenience
inline Display* wxGlobalDisplay() { return (Display*) wxGetDisplay(); }
@@
-148,7
+148,7
@@
bool wxWindowIsVisible(Window win);
bool wxDoSetShape( Display* xdisplay, Window xwindow, const wxRegion& region );
bool wxDoSetShape( Display* xdisplay, Window xwindow, const wxRegion& region );
-class WXDLL
EXPORT
wxXVisualInfo
+class WXDLL
IMPEXP_CORE
wxXVisualInfo
{
public:
wxXVisualInfo();
{
public:
wxXVisualInfo();