use typed containers in wxHtmlParser instead of type-unsafe wxList/wxHashTable

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

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index d6d7ffe5e8db63df7d169dcdfd029acd3d0d63cb..7e52ecd46752aaed4013684d1f79969f6913f32c 100644 (file)
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -6,16 +6,12 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MOTIF_FRAME_H_
 #define _WX_MOTIF_FRAME_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "frame.h"
-#endif
-
 class WXDLLEXPORT wxFrame : public wxFrameBase
 {
 public:
@@ -43,7 +39,7 @@ public:
 
     virtual ~wxFrame();
 
-    virtual bool Show(bool show = TRUE);
+    virtual bool Show(bool show = true);
 
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
@@ -52,7 +48,6 @@ public:
     void SetTitle(const wxString& title);
 
     // Set icon
-    virtual void SetIcon(const wxIcon& icon);
     virtual void SetIcons(const wxIconBundle& icons);
 
 #if wxUSE_STATUSBAR
@@ -62,7 +57,7 @@ public:
     // Create toolbar
 #if wxUSE_TOOLBAR
     virtual wxToolBar* CreateToolBar(long style = -1,
-                                     wxWindowID id = -1,
+                                     wxWindowID id = wxID_ANY,
                                      const wxString& name = wxToolBarNameStr);
     virtual void SetToolBar(wxToolBar *toolbar);
     virtual void PositionToolBar();
@@ -74,7 +69,7 @@ public:
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     void OnActivate(wxActivateEvent& event);
 
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeFont(bool keepOriginalSize = true);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetMenuBarWidget() const;
@@ -117,17 +112,19 @@ private:
     virtual void DoSetClientSize(int width, int height);
 
 private:
-    virtual bool DoCreate( wxWindow* parent, wxWindowID id,
-                           const wxString& title,
-                           const wxPoint& pos,
-                           const wxSize& size,
-                           long style,
-                           const wxString& name );
-    virtual void DoDestroy();
+    virtual bool XmDoCreateTLW(wxWindow* parent,
+                               wxWindowID id,
+                               const wxString& title,
+                               const wxPoint& pos,
+                               const wxSize& size,
+                               long style,
+                               const wxString& name);
+
+
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)
 };
 
-#endif
-// _WX_MOTIF_FRAME_H_
+#endif // _WX_MOTIF_FRAME_H_
+