Fixed conflicts with Robert's similar fixes; fixed toolbar size calculation

[wxWidgets.git] / include / wx / motif / private.h

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index 7e055be69242aa675cc0b33ba04c7e440954b836..ec1f7efa653a6cac594fb8ede8486cde7a459cfe 100644 (file)
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -1,41 +1,63 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        private.h
-// Purpose:     Private declarations
+// Purpose:     Private declarations for wxMotif port
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRIVATE_H_
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"
+#include "X11/Xlib.h"
 
-class WXDLLEXPORT wxMouseEvent;
-class WXDLLEXPORT wxKeyEvent;
+#include "wx/x11/privx.h"
 
-/* Put any private declarations here.
- */
+// Put any private declarations here: native Motif types may be used because
+// this header is included after Xm/Xm.h
 
+// ----------------------------------------------------------------------------
+// common callbacks
+// ----------------------------------------------------------------------------
+
+// All widgets should have this as their resize proc.
 extern void wxWidgetResizeProc(Widget w, XConfigureEvent *event, String args[], int *num_args);
 
-extern wxHashTable *wxWidgetHashTable;
+// For repainting arbitrary windows
+void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *);
+
+// ----------------------------------------------------------------------------
+// we maintain a hash table which contains the mapping from Widget to wxWindow
+// corresponding to the window for this widget
+// ----------------------------------------------------------------------------
+
 extern void wxDeleteWindowFromTable(Widget w);
 extern wxWindow *wxGetWindowFromTable(Widget w);
 extern bool wxAddWindowToTable(Widget w, wxWindow *win);
+
+// ----------------------------------------------------------------------------
+// key events related functions
+// ----------------------------------------------------------------------------
+
 extern char wxFindMnemonic(const char* s);
-extern char * wxFindAccelerator (char *s);
-extern XmString wxFindAcceleratorText (char *s);
-extern int wxCharCodeXToWX(KeySym keySym);
-extern KeySym wxCharCodeWXToX(int id);
-bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent);
-bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent);
-int wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap);
-
-#define        wxNO_COLORS   0x00
+
+extern char * wxFindAccelerator (const char *s);
+extern XmString wxFindAcceleratorText (const char *s);
+
+// ----------------------------------------------------------------------------
+// TranslateXXXEvent() functions - translate Motif event to wxWindow one
+// ----------------------------------------------------------------------------
+extern bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent);
+extern bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Widget widget, XEvent *xevent);
+
+extern void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour);
+extern void wxDoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour = FALSE);
+
+#define wxNO_COLORS   0x00
 #define wxBACK_COLORS 0x01
 #define wxFORE_COLORS 0x02
 
@@ -47,5 +69,43 @@ extern XColor itemColors[5] ;
 #define wxTOPS_INDEX 3
 #define wxBOTS_INDEX 4
 
+// ----------------------------------------------------------------------------
+// utility classes
+// ----------------------------------------------------------------------------
+
+// XmString made easy to use in wxWindows (and has an added benefit of
+// cleaning up automatically)
+class wxXmString
+{
+public:
+    wxXmString(const wxString& str)
+    {
+        m_string = XmStringCreateLtoR((char *)str.c_str(),
+            XmSTRING_DEFAULT_CHARSET);
+    }
+    
+    ~wxXmString() { XmStringFree(m_string); }
+    
+    // semi-implicit conversion to XmString (shouldn't rely on implicit
+    // conversion because many of Motif functions are macros)
+    XmString operator()() const { return m_string; }
+    
+private:
+    XmString m_string;
+};
+
+// ----------------------------------------------------------------------------
+// macros to avoid casting WXFOO to Foo all the time
+// ----------------------------------------------------------------------------
+
+// argument is of type "wxWindow *"
+#define GetWidget(w)    ((Widget)(w)->GetHandle())
+
+// ----------------------------------------------------------------------------
+// accessors for C modules
+// ----------------------------------------------------------------------------
+
+extern "C" XtAppContext wxGetAppContext();
+
 #endif
-    // _WX_PRIVATE_H_
+// _WX_PRIVATE_H_