fixes for Sun CC 5.0 (unlike 4.2 it understands bool)

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

diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index f4a6a05f4c587486756787cace3406688be4f837..ae9f07668d861f9f935d3d8062e15e4e6bf9ad25 100644 (file)
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -275,6 +275,10 @@ public:
   virtual void SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh = TRUE);
 
   virtual void SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh = TRUE);
 

+  // Helper functions for Motif
+  void CreateScrollbar(int orientation);
+  void DestroyScrollbar(int orientation);
+

   virtual void SetScrollPos(int orient, int pos, bool refresh = TRUE);
   virtual int GetScrollPos(int orient) const;
   virtual int GetScrollRange(int orient) const;
   virtual void SetScrollPos(int orient, int pos, bool refresh = TRUE);
   virtual int GetScrollPos(int orient) const;
   virtual int GetScrollRange(int orient) const;


@@ -412,6 +416,8 @@ public:
 
   void OnEraseBackground(wxEraseEvent& event);
   void OnChar(wxKeyEvent& event);
 
   void OnEraseBackground(wxEraseEvent& event);
   void OnChar(wxKeyEvent& event);

+  void OnKeyDown(wxKeyEvent& event);
+  void OnKeyUp(wxKeyEvent& event);

   void OnPaint(wxPaintEvent& event);
   void OnIdle(wxIdleEvent& event);
 
   void OnPaint(wxPaintEvent& event);
   void OnIdle(wxIdleEvent& event);
 


@@ -686,5 +692,19 @@ wxWindow* WXDLLEXPORT wxGetActiveWindow();
 
 WXDLLEXPORT_DATA(extern wxList) wxTopLevelWindows;
 
 
 WXDLLEXPORT_DATA(extern wxList) wxTopLevelWindows;
 

+// A little class to switch off size optimization while an instance of the object
+// exists
+class WXDLLEXPORT wxNoOptimize: public wxObject
+{
+public:
+  wxNoOptimize();
+  ~wxNoOptimize();
+
+  static bool CanOptimize();
+
+protected:
+  static int m_count;
+};
+

 #endif
     // _WX_WINDOW_H_
 #endif
     // _WX_WINDOW_H_