Changeset 3470 in Sophya for trunk/SophyaPI

Timestamp:

Feb 14, 2008, 10:43:34 AM (18 years ago)

Author:

mansoux

Message:

Rajout HITextView

Location:

trunk/SophyaPI/PI/Quartz

Files:

• PIControl.cpp (modified) (1 diff)
• pistdwdgmosx.cpp (modified) (8 diffs)
• pistdwdgmosx.h (modified) (3 diffs)
• piwdgmosx.cpp (modified) (1 diff)
• piwdgmosx.h (modified) (2 diffs)

trunk/SophyaPI/PI/Quartz/PIControl.cpp

@@ -9 +9 @@
 
 #include "PIControl.h"
+#include "pistdwdggen.h"
+#include "PIContainerQuartz.h"
 
 PIControl::PIControl(PIContainerGen *par, const char *nom,int sx, int sy, int px, int py)
 :PIWdgQuartz(par, nom, sx, sy, px, py) 
 {
+        wParent = ((PIContainer *)par)->GetWindowPtr();
+        SetPortWindowPort(wParent);
+    SetRect(&wdgRect,px,py,px+sx,py+sy);
     contH = NULL;
 }

trunk/SophyaPI/PI/Quartz/pistdwdgmosx.cpp

@@ -17 +17 @@
 : PILabelGen(par, nom, sx, sy, px, py)
 {
+        OSStatus err;
+        
+        string sNom(nom);
+        wParent = ((PIContainer *)par)->GetWindowPtr();
+        SetPortWindowPort(wParent);
+    SetRect(&wdgRect,px,py,px+sx,py+sy);
+        cfsrLabel = CFStringCreateWithCString(kCFAllocatorDefault,nom,kCFStringEncodingMacRoman);
+        err = CreateStaticTextControl (wParent, &wdgRect, cfsrLabel, NULL, &contH);
 }
 
@@ -30 +38 @@
         
         cfsrLabel = CFStringCreateWithCString(kCFAllocatorDefault,sLabel.c_str(),kCFStringEncodingMacRoman);
-        err = DrawThemeTextBox (cfsrLabel,
-                                                        kThemeSystemFont,
-                                                        kThemeStateInactive,
-                                                        false,
-                                                        &wdgRect,
-                                                        teJustLeft,
-                                                        NULL);
-                        
-        return;
-} 
+        SetPortWindowPort(wParent);
+
+        err = SetControlData (contH,0,kControlEditTextCFStringTag,sizeof(cfsrLabel),(Ptr)&cfsrLabel);
+
+        return;
+}
 
 
@@ -46 +50 @@
 /* --Methode-- */
 PITextQuartz::PITextQuartz(PIContainerGen *par, const char *nom, int sx, int sy, int px, int py)
+: PITextGen(par, nom, sx, sy, px, py)
+{
+        OSStatus err;
+        wParent = ((PIContainer *)par)->GetWindowPtr();
+    SetRect(&wdgRect,px,py,px+sx,py+sy);
+}
+
+/* --Methode-- */
+PITextQuartz::PITextQuartz(PIContainerGen* par, const char* nom, bool vsb, bool hsb,
+                             int sx, int sy, int px, int py)
+: PITextGen(par, nom, vsb, hsb, sx, sy, px, py)
+{
+}
+
+/* --Methode-- */
+PITextQuartz::~PITextQuartz()
+{
+}
+
+
+/* --Methode-- */
+void PITextQuartz::SetText(string const& s)
+{       
+        OSStatus err;
+        
+        unicodeText = CFStringCreateWithCString (NULL,(char *)s.c_str(), kCFStringEncodingMacRoman);
+        err = CreateEditUnicodeTextControl (wParent,&wdgRect,unicodeText,false,NULL,&contH);
+
+        return;
+}
+
+/* --Methode-- */
+string PITextQuartz::GetText() const
+{
+        char* cText;
+        
+        cText = (char *)CFStringGetCStringPtr(unicodeText,kCFStringEncodingMacRoman);   
+        string sText(cText);    
+        return (sText);
+}
+
+
+/* --Methode-- */
+void PITextQuartz::SetMutiLineMode(bool mlm)
+{
+        return;
+}
+
+
+/* --Methode-- */
+void PITextQuartz::SetTextEditable(bool te)
+{
+        return;
+}
+
+
+/* --Methode-- */
+void PITextQuartz::SetMsg(PIMessage msg)
+{
+
+}
+
+
+/* ========== PIHITextViewQuartz ========== */
+
+/* --Methode-- */
+PIHITextViewQuartz::PIHITextViewQuartz(PIContainerGen *par, const char *nom, int sx, int sy, int px, int py)
 : PITextGen(par, nom, sx, sy, px, py)
 {
@@ -59 +130 @@
         fx = px+sx-mx;
         fy = py+sy-my;
-        
+    SetRect(&wdgRect,px,py,px+sx,py+sy);
+
         SetRect(&userPaneRect,ox,oy,fx,fy);
         hiRect.origin.x = ox;
@@ -71 +143 @@
 
 /* --Methode-- */
-PITextQuartz::PITextQuartz(PIContainerGen* par, const char* nom, bool vsb, bool hsb,
+PIHITextViewQuartz::PIHITextViewQuartz(PIContainerGen* par, const char* nom, bool vsb, bool hsb,
                              int sx, int sy, int px, int py)
 : PITextGen(par, nom, vsb, hsb, sx, sy, px, py)
@@ -78 +150 @@
 
 /* --Methode-- */
-PITextQuartz::~PITextQuartz()
-{
-}
-
-
-/* --Methode-- */
-void PITextQuartz::SetText(string const& s)
+PIHITextViewQuartz::~PIHITextViewQuartz()
+{
+}
+
+
+/* --Methode-- */
+void PIHITextViewQuartz::SetText(string const& s)
 {       
         OSStatus err;
@@ -105 +177 @@
 
 /* --Methode-- */
-string PITextQuartz::GetText() const
+string PIHITextViewQuartz::GetText() const
 {
         CFStringRef str;
@@ -124 +196 @@
 
 /* --Methode-- */
-void PITextQuartz::SetMutiLineMode(bool mlm)
-{
-        return;
-}
-
-
-/* --Methode-- */
-void PITextQuartz::SetTextEditable(bool te)
-{
-        return;
-}
-
-
-/* --Methode-- */
-void PITextQuartz::SetMsg(PIMessage msg)
-{
-
-}
+void PIHITextViewQuartz::SetMutiLineMode(bool mlm)
+{
+        return;
+}
+
+
+/* --Methode-- */
+void PIHITextViewQuartz::SetTextEditable(bool te)
+{
+        return;
+}
+
+
+/* --Methode-- */
+void PIHITextViewQuartz::SetMsg(PIMessage msg)
+{
+
+}

trunk/SophyaPI/PI/Quartz/pistdwdgmosx.h

@@ -21 +21 @@
 };
 
-typedef PILabelQuartz PILabel;
-
 class PITextQuartz : public PITextGen
 {
@@ -41 +39 @@
         
 protected:
+        CFStringRef unicodeText;
+};
+
+
+class PIHITextViewQuartz : public PITextGen
+{
+public:
+        PIHITextViewQuartz(PIContainerGen *par, const char *nom, 
+                                int sx=10, int sy=10, int px=0, int py=0);
+
+        PIHITextViewQuartz(PIContainerGen* par, const char* nom, bool vsb, bool hsb,
+                             int sx=100, int sy=100, int px=0, int py=0);
+  virtual           ~PIHITextViewQuartz();
+  virtual void      SetText(string const&);
+  virtual string    GetText() const;
+
+  virtual void      SetMutiLineMode(bool mlm=false);
+  virtual void      SetTextEditable(bool te=true);
+
+  virtual void          SetMsg(PIMessage msg=0);
+        
+protected:
         UniChar* uniChars;
         CFIndex textLength;
         HIViewRef outTextView;
-        WindowRef wParent;
         HIRect hiRect;
         ControlRef fUserPane;
@@ -50 +69 @@
 };
 
+
+
+typedef PILabelQuartz PILabel;
 typedef PITextQuartz PIText;
+typedef PIHITextViewQuartz PITextView;
 
 #endif

trunk/SophyaPI/PI/Quartz/piwdgmosx.cpp

@@ -16 +16 @@
     fflush (stdout);
     title = CFStringCreateWithCString (NULL, nom, kCFStringEncodingMacRoman);
-    SetRect(&wdgRect,px,py,px+sx,py+sy);
     contH = NULL;
     wPtr = NULL;
+        wParent = NULL;
     mFCol = mBCol = PI_NotDefColor;
 }

trunk/SophyaPI/PI/Quartz/piwdgmosx.h

@@ -14 +14 @@
 
 #include "piwdggen.h"
-
 
 
@@ -102 +101 @@
     ControlRef  contH;
     WindowPtr   wPtr;
+        WindowRef       wParent;
 //  pas utilisable dans MOSX/Carbon
     PIColors mFCol, mBCol;