don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/motif/toplevel.h b/include/wx/motif/toplevel.h
index 35bef8c4843ecf3070b8e2451d62adcfce9782a6..4144b83a3a48952156a0dcd1fccc889f031027f8 100644 (file)
--- a/include/wx/motif/toplevel.h
+++ b/include/wx/motif/toplevel.h
@@ -12,11 +12,7 @@
 #ifndef __MOTIFTOPLEVELH__
 #define __MOTIFTOPLEVELH__
 
 #ifndef __MOTIFTOPLEVELH__
 #define __MOTIFTOPLEVELH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "toplevel.h"
-#endif
-
-class wxTopLevelWindowMotif : public wxTopLevelWindowBase
+class WXDLLIMPEXP_CORE wxTopLevelWindowMotif : public wxTopLevelWindowBase

 {
 public:
     wxTopLevelWindowMotif() { Init(); }
 {
 public:
     wxTopLevelWindowMotif() { Init(); }


@@ -44,9 +40,9 @@ public:
     virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL );
     virtual bool IsFullScreen() const;
 
     virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL );
     virtual bool IsFullScreen() const;
 

-    virtual void Maximize(bool maximize = TRUE);
+    virtual void Maximize(bool maximize = true);

     virtual void Restore();
     virtual void Restore();

-    virtual void Iconize(bool iconize = TRUE);
+    virtual void Iconize(bool iconize = true);

     virtual bool IsMaximized() const;
     virtual bool IsIconized() const;
 
     virtual bool IsMaximized() const;
     virtual bool IsIconized() const;
 


@@ -56,10 +52,6 @@ public:
     virtual wxString GetTitle() const { return m_title; }
     virtual void SetTitle( const wxString& title ) { m_title = title; }
 
     virtual wxString GetTitle() const { return m_title; }
     virtual void SetTitle( const wxString& title ) { m_title = title; }
 

-    virtual void SetSizeHints( int minW, int minH,
-                               int maxW = -1, int maxH = -1,
-                               int incW = -1, int incH = -1 );
-

     virtual bool SetShape( const wxRegion& region );
 
     WXWidget GetShellWidget() const;
     virtual bool SetShape( const wxRegion& region );
 
     WXWidget GetShellWidget() const;


@@ -70,19 +62,20 @@ protected:
     void PreDestroy();
 
     virtual void DoGetPosition(int* x, int* y) const;
     void PreDestroy();
 
     virtual void DoGetPosition(int* x, int* y) const;

+    virtual void DoSetSizeHints(int minW, int minH,
+                                int maxW, int maxH,
+                                int incW, int incH);
+

 private:
 private:

-    // both these functions should be pure virtual
-    virtual bool DoCreate( wxWindow* parent, wxWindowID id,
-                           const wxString& title,
-                           const wxPoint& pos,
-                           const wxSize& size,
-                           long style,
-                           const wxString& name )
-    {
-        return FALSE;
-    }
+    // really create the Motif widget for TLW
+    virtual bool XmDoCreateTLW(wxWindow* parent,
+                               wxWindowID id,
+                               const wxString& title,
+                               const wxPoint& pos,
+                               const wxSize& size,
+                               long style,
+                               const wxString& name) = 0;

 
 

-    virtual void DoDestroy() { }

 
     wxString m_title;
 };
 
     wxString m_title;
 };