wxMotif compiles and links now.

[wxWidgets.git] / include / wx / msw / stattext.h

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 053651b819b6852e9fc817cffc3d775917e7cea2..e59beeab30012cacabeba4a10048237e6b9aec2c 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;

 
 class WXDLLEXPORT wxStaticText : public wxControl
 {
 
 class WXDLLEXPORT wxStaticText : public wxControl
 {


@@ -47,16 +47,12 @@ public:
     // accessors
     void SetLabel(const wxString& label);
     
     // accessors
     void SetLabel(const wxString& label);
     

-    // operations
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
-    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { }
-    

     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return FALSE; }
     
     // callbacks
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return FALSE; }
     
     // callbacks
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

-        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

     virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
 protected:
     virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
 protected: